Merge branch 'develop' of github.com:secure-software-engineering/FlowDroid into develop

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/axml/AXmlNode.java

@@ -198,6 +198,19 @@ public List<AXmlNode> getChildrenWithTag(String tag) {
 		return children;
 	}
 
+	/**
+	 * Removes an element from the attributes.
+	 *
+	 * @param key the key
+	 * @return the previously associated value or null
+	 */
+	public AXmlAttribute<?> removeAttribute(String key) {
+		if (this.attributes == null)
+			return null;
+		return this.attributes.remove(key);
+	}
+
+
 	/**
 	 * Returns a map which contains all attributes. The keys match the attributes'
 	 * names.

soot-infoflow-android/src/soot/jimple/infoflow/android/axml/parsers/AXML20Parser.java

@@ -78,6 +78,8 @@ public void attr(String ns, String name, int resourceId, int type, Object obj) {
 						// Without a name, we cannot really carry on
 						return;
 					}
+					if (tname == null)
+						tname = String.valueOf(resourceId);
 				}
 			} else
 				tname = name.trim();