Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass url to the AIA supervisor

Browse Source 
am: 52f179fd0e

Change-Id: Ibf10b00e436dbd520e4326a23181562b67581e20
This commit is contained in:
Todd Kennedy
2016-09-22 22:42:20 +00:00
committed by android-build-merger
parent 12de26b83b 52f179fd0e
commit c2467b8c68
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -544,9 +544,7 @@ class ActivityStarter {
ephemeralIntent.setPackage(ephemeralPackage); ephemeralIntent.setPackage(ephemeralPackage);
} else { } else {
// Success intent goes back to the installer // Success intent goes back to the installer
// TODO; do we need any extras for the installer?
ephemeralIntent = new Intent(launchIntent); ephemeralIntent = new Intent(launchIntent);
ephemeralIntent.setData(null);
} }
// Intent that is eventually launched if the ephemeral package was // 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_FAILURE, new IntentSender(failureIntentTarget));
intent.putExtra(Intent.EXTRA_EPHEMERAL_SUCCESS, new IntentSender(successIntentTarget)); intent.putExtra(Intent.EXTRA_EPHEMERAL_SUCCESS, new IntentSender(successIntentTarget));
// TODO: Remove when the platform has fully implemented ephemeral apps // TODO: Remove when the platform has fully implemented ephemeral apps
intent.setData(origIntent.getData()); intent.setData(origIntent.getData().buildUpon().clearQuery().build());
return intent; return intent;
} }