From 52f179fd0eebf6452b2ab2844cfe83bd3ec356b8 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Wed, 21 Sep 2016 15:53:50 -0700 Subject: [PATCH] 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index cec37d850e184..06d8e4875e0a4 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 @@ class ActivityStarter { 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 @@ class ActivityStarter { 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; }