diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2020-02-10 08:46:26 -0800 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2020-02-12 18:51:53 +0000 |
| commit | ee29509ecd73c3910011b2bdc12d1ef28fcb5a3d (patch) | |
| tree | 88289fe02f2ffd203dd0468e829e42b56ea9118f /core/java/android/app/Activity.java | |
| parent | 998c6ad176d4c419f52184842692c3009379d3f5 (diff) | |
Revert "Revert "Activity start: Send featureId from context->AppOpsManager""
This reverts commit e7421e92d947b09ca3cb9e6dfb66bbb27b9ed114.
Exempt-From-Owner-Approval: revert-revert and only piping anyway
Test: 1:1 revert-revert
Bug: 136595429
Change-Id: I44e5fa2019f5604c6e2c08bdd1967129c64a90a7
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 642f51b6bb63..2319dd2c168f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5810,9 +5810,9 @@ public class Activity extends ContextThemeWrapper intent.prepareToLeaveProcess(this); result = ActivityTaskManager.getService() .startActivity(mMainThread.getApplicationThread(), getBasePackageName(), - intent, intent.resolveTypeIfNeeded(getContentResolver()), mToken, - mEmbeddedID, requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED, - null, options); + getFeatureId(), intent, + intent.resolveTypeIfNeeded(getContentResolver()), mToken, mEmbeddedID, + requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED, null, options); } catch (RemoteException e) { // Empty } @@ -6606,8 +6606,8 @@ public class Activity extends ContextThemeWrapper try { data.prepareToLeaveProcess(this); IIntentSender target = - ActivityManager.getService().getIntentSender( - ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName, + ActivityManager.getService().getIntentSenderWithFeature( + ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName, getFeatureId(), mParent == null ? mToken : mParent.mToken, mEmbeddedID, requestCode, new Intent[] { data }, null, flags, null, getUserId()); |