resolve merge conflict

Author: Jami Cogswell

java/ql/test/library-tests/frameworks/android/intent/TestStartActivityToGetIntent.java

@@ -2,24 +2,68 @@
 import android.content.Context;
 import android.content.Intent;
 
+// ! Original - saving for reference
+// public class TestStartActivityToGetIntent {
+
+//     static Object source() {
+//         return null;
+//     }
+
+//     static void sink(Object sink) {
+//     }
+
+//     public void test(Context ctx) {
+//         Intent intent = new Intent(null, SomeActivity.class);
+//         intent.putExtra("data", (String) source());
+//         ctx.startActivity(intent);
+//     }
+
+//     static class SomeActivity extends Activity {
+
+//         public void test() {
+//             sink(getIntent().getStringExtra("data")); // $ hasValueFlow
+//         }
+//     }
+// }
+
 public class TestStartActivityToGetIntent {
 
-    static Object source() {
+    static Object source(String kind) {
         return null;
     }
 
-    static void sink(Object sink) {}
+    static void sink(Object sink) {
+    }
 
-    public void test(Context ctx) {
-        Intent intent = new Intent(null, SomeActivity.class);
-        intent.putExtra("data", (String) source());
-        ctx.startActivity(intent);
+    public void test(Context ctx, Activity act) {
+        {
+            Intent intentCtx = new Intent(null, SomeActivity.class);
+            Intent intentAct = new Intent(null, SomeActivity.class);
+            intentCtx.putExtra("data", (String) source("context"));
+            intentAct.putExtra("data", (String) source("activity"));
+            ctx.startActivity(intentCtx);
+            act.startActivity(intentAct);
+        }
+
+        {
+            Intent intentCtx = new Intent(null, SafeActivity.class);
+            Intent intentAct = new Intent(null, SafeActivity.class);
+            ctx.startActivity(intentCtx);
+            act.startActivity(intentAct);
+        }
     }
 
     static class SomeActivity extends Activity {
 
         public void test() {
-            sink(getIntent().getStringExtra("data")); // $ hasValueFlow
+            sink(getIntent().getStringExtra("data")); // $ hasValueFlow=context hasValueFlow=activity
+        }
+    }
+
+    static class SafeActivity extends Activity {
+
+        public void test() {
+            sink(getIntent().getStringExtra("data")); // Safe
         }
     }
 }

java/ql/test/library-tests/frameworks/android/intent/TestStartBroadcastReceiverToIntent.java

@@ -0,0 +1,42 @@
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class TestStartBroadcastReceiverToIntent {
+
+    static Object source() {
+        return null;
+    }
+
+    static void sink(Object sink) {
+    }
+
+    public void test(Context ctx) {
+        {
+            Intent intent = new Intent(null, SomeBroadcastReceiver.class);
+            intent.putExtra("data", (String) source());
+            ctx.sendBroadcast(intent);
+        }
+
+        {
+            Intent intent = new Intent(null, SafeBroadcastReceiver.class);
+            ctx.sendBroadcast(intent);
+        }
+    }
+
+    static class SomeBroadcastReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+        }
+    }
+
+    static class SafeBroadcastReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            sink(intent.getStringExtra("data")); // Safe
+        }
+    }
+}

java/ql/test/library-tests/frameworks/android/intent/TestStartComponentToIntent.java

@@ -1,6 +1,6 @@
 import android.app.Activity;
-import android.app.Service;
-import android.content.BroadcastReceiver;
+//import android.app.Service;
+//import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 

java/ql/test/library-tests/frameworks/android/intent/TestStartServiceToIntent.java

@@ -0,0 +1,99 @@
+import android.app.Service;
+import android.os.IBinder;
+import android.content.Context;
+import android.content.Intent;
+
+public class TestStartServiceToIntent {
+
+    static Object source() {
+        return null;
+    }
+
+    static void sink(Object sink) {
+    }
+
+    public void test(Context ctx) {
+        {
+            Intent intent = new Intent(null, SomeService.class);
+            intent.putExtra("data", (String) source());
+            ctx.startService(intent);
+        }
+
+        {
+            Intent intent = new Intent(null, SafeService.class);
+            ctx.startService(intent);
+        }
+    }
+
+    static class SomeService extends Service {
+
+        @Override
+        public void onStart(Intent intent, int startId) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+        }
+
+        @Override
+        public int onStartCommand(Intent intent, int flags, int startId) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+            return -1;
+        }
+
+        @Override
+        public IBinder onBind(Intent intent) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+            return null;
+        }
+
+        @Override
+        public boolean onUnbind(Intent intent) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+            return false;
+        }
+
+        @Override
+        public void onRebind(Intent intent) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+        }
+
+        @Override
+        public void onTaskRemoved(Intent intent) {
+            sink(intent.getStringExtra("data")); // $ hasValueFlow
+        }
+    }
+
+    static class SafeService extends Service {
+
+        @Override
+        public void onStart(Intent intent, int startId) {
+            sink(intent.getStringExtra("data")); // Safe
+        }
+
+        @Override
+        public int onStartCommand(Intent intent, int flags, int startId) {
+            sink(intent.getStringExtra("data")); // Safe
+            return -1;
+        }
+
+        @Override
+        public IBinder onBind(Intent intent) {
+            sink(intent.getStringExtra("data")); // Safe
+            return null;
+        }
+
+        @Override
+        public boolean onUnbind(Intent intent) {
+            sink(intent.getStringExtra("data")); // Safe
+            return false;
+        }
+
+        @Override
+        public void onRebind(Intent intent) {
+            sink(intent.getStringExtra("data")); // Safe
+        }
+
+        @Override
+        public void onTaskRemoved(Intent intent) {
+            sink(intent.getStringExtra("data")); // Safe
+        }
+    }
+}