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

Merge "Pass url to the AIA supervisor" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-22 20:56:13 +00:00
committed by Android (Google) Code Review
parent 8423493a85 52f179fd0e
commit bce1e8c836
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;
} }