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

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/AbstractCallbackAnalyzer.java

@@ -615,8 +615,12 @@ protected boolean invokesSetContentView(InvokeExpr inv) {
 					|| curClass.getName().equals("android.support.v7.app.AppCompatActivity")
 					|| curClass.getName().equals("androidx.appcompat.app.AppCompatActivity"))
 				return true;
-			if (curClass.declaresMethod("void setContentView(int)"))
-				return false;
+            // As long as the class is subclass of android.app.Activity,
+            // it can be sure that the setContentView method is what we expected.
+            // Following 2 statements make the overriding of method
+            // setContentView ignored.
+			// if (curClass.declaresMethod("void setContentView(int)"))
+			// 	return false;
 			curClass = curClass.hasSuperclass() ? curClass.getSuperclass() : null;
 		}
 		return false;

soot-infoflow-android/src/soot/jimple/infoflow/android/config/SootConfigForAndroid.java

@@ -25,7 +25,9 @@ public void setSootOptions(Options options, InfoflowConfiguration config) {
 		List<String> excludeList = new LinkedList<String>();
 		excludeList.add("java.*");
 		excludeList.add("sun.*");
-		excludeList.add("android.*");
+        // exclude classes of android.* will cause layout class cannot be 
+        // loaded for layout file based callback analysis.
+		// excludeList.add("android.*");
 		excludeList.add("org.apache.*");
 		excludeList.add("org.eclipse.*");
 		excludeList.add("soot.*");