Add missing expected type tags for content providers

(cherry picked from commit 954d8b2)

Author: MarcMil

soot-infoflow-android/src/soot/jimple/infoflow/android/entryPointCreators/AndroidEntryPointCreator.java

@@ -308,7 +308,9 @@ protected SootMethod createDummyMainInternal() {
 							componentToInfo.getComponentExchangeInfo());
 					SootMethod m = cpc.createInit();
 					Local cpLocal = generator.generateLocal(RefType.v(AndroidEntryPointConstants.CONTENTPROVIDERCLASS));
-					body.getUnits().add(Jimple.v().newAssignStmt(cpLocal, Jimple.v().newStaticInvokeExpr(m.makeRef())));
+					AssignStmt cp = Jimple.v().newAssignStmt(cpLocal, Jimple.v().newStaticInvokeExpr(m.makeRef()));
+					cp.addTag(new ExpectedTypeTag(currentClass.getType()));
+					body.getUnits().add(cp);
 					localVarsForClasses.put(currentClass, cpLocal);
 					cpComponents.put(currentClass, cpc);
 

soot-infoflow-android/src/soot/jimple/infoflow/android/entryPointCreators/components/ContentProviderEntryPointCreator.java

@@ -16,13 +16,18 @@
 import soot.SootField;
 import soot.SootMethod;
 import soot.Type;
+import soot.Unit;
 import soot.UnitPatchingChain;
+import soot.jimple.IdentityStmt;
 import soot.jimple.Jimple;
+import soot.jimple.JimpleBody;
 import soot.jimple.NopStmt;
+import soot.jimple.ParameterRef;
 import soot.jimple.infoflow.android.entryPointCreators.AndroidEntryPointConstants;
 import soot.jimple.infoflow.android.entryPointCreators.ComponentExchangeInfo;
 import soot.jimple.infoflow.android.manifest.IManifestHandler;
 import soot.jimple.infoflow.util.SootUtils;
+import soot.tagkit.ExpectedTypeTag;
 
 /**
  * Entry point creator for content providers
@@ -101,7 +106,16 @@ public Collection<SootMethod> getAdditionalMethods() {
 	protected void createEmptyMainMethod() {
 		super.createEmptyMainMethod();
 		//the parameter with the content provider local
-		thisLocal = mainMethod.getActiveBody().getParameterLocal(1);
+		JimpleBody jb = (JimpleBody) mainMethod.getActiveBody();
+		thisLocal = jb.getParameterLocal(1);
+		for (Unit i : jb.getUnits()) {
+			if (i instanceof IdentityStmt && ((IdentityStmt) i).getRightOp() instanceof ParameterRef) {
+				ParameterRef paramRef = (ParameterRef) ((IdentityStmt) i).getRightOp();
+				if (paramRef.getIndex() == 1) {
+					i.addTag(new ExpectedTypeTag(component.getType()));
+				}
+			}
+		}
 	}
 
 	@Override