commit 52f179fd0eebf6452b2ab2844cfe83bd3ec356b8
author Todd Kennedy <toddke@google.com> Wed Sep 21 15:53:50 2016 -0700
committer Todd Kennedy <toddke@google.com> Thu Sep 22 12:23:03 2016 -0700
tree 006777166a0060fb8aa39de6a95fb88071158836
parent 82f050f736e0bbf5ef7fe8b4dcd76ecb0a590334

Pass url to the AIA supervisor

The supervisor needs the URL in order to start the correct AIA.

Change-Id: Ied9b50031b31f6da07196efbccbb27cacda1355f
Fixes: 31664252
Test: manually ran through ephemeral scenario

services/core/java/com/android/server/am/ActivityStarter.java

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index cec37d8..06d8e48 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -544,9 +544,7 @@
             ephemeralIntent.setPackage(ephemeralPackage);
         } else {
             // Success intent goes back to the installer
-            // TODO; do we need any extras for the installer?
             ephemeralIntent = new Intent(launchIntent);
-            ephemeralIntent.setData(null);
         }
 
         // Intent that is eventually launched if the ephemeral package was
@@ -571,7 +569,7 @@
         intent.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, new IntentSender(failureIntentTarget));
         intent.putExtra(Intent.EXTRA_EPHEMERAL_SUCCESS, new IntentSender(successIntentTarget));
         // TODO: Remove when the platform has fully implemented ephemeral apps
-        intent.setData(origIntent.getData());
+        intent.setData(origIntent.getData().buildUpon().clearQuery().build());
         return intent;
     }