diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-06 09:55:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-06 09:55:18 +0000 |
| commit | e875230f57bfafea8f057af8d7f2e97cd6932d99 (patch) | |
| tree | a72eb89173c2ed86e383eb40f34e13a2a7494ebb /core/java/android/app/Instrumentation.java | |
| parent | ca04b8dd170b329c453d9ab914e78d9fee69ef6f (diff) | |
| parent | e9a5ed804e0dd36ea231cd9c94af28f478cd8d73 (diff) | |
Merge "Use op package name as the calling package while start activities"
Diffstat (limited to 'core/java/android/app/Instrumentation.java')
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 9e967958c9cb..3e249bb24dd6 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1725,7 +1725,7 @@ public class Instrumentation { intent.migrateExtraStreamToClipData(who); intent.prepareToLeaveProcess(who); int result = ActivityTaskManager.getService().startActivity(whoThread, - who.getBasePackageName(), who.getAttributionTag(), intent, + who.getOpPackageName(), who.getAttributionTag(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, requestCode, 0, null, options); checkStartActivityResult(result, intent); @@ -1797,7 +1797,7 @@ public class Instrumentation { resolvedTypes[i] = intents[i].resolveTypeIfNeeded(who.getContentResolver()); } int result = ActivityTaskManager.getService().startActivities(whoThread, - who.getBasePackageName(), who.getAttributionTag(), intents, resolvedTypes, + who.getOpPackageName(), who.getAttributionTag(), intents, resolvedTypes, token, options, userId); checkStartActivityResult(result, intents[0]); return result; @@ -1864,7 +1864,7 @@ public class Instrumentation { intent.migrateExtraStreamToClipData(who); intent.prepareToLeaveProcess(who); int result = ActivityTaskManager.getService().startActivity(whoThread, - who.getBasePackageName(), who.getAttributionTag(), intent, + who.getOpPackageName(), who.getAttributionTag(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target, requestCode, 0, null, options); checkStartActivityResult(result, intent); @@ -1931,7 +1931,7 @@ public class Instrumentation { intent.migrateExtraStreamToClipData(who); intent.prepareToLeaveProcess(who); int result = ActivityTaskManager.getService().startActivityAsUser(whoThread, - who.getBasePackageName(), who.getAttributionTag(), intent, + who.getOpPackageName(), who.getAttributionTag(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, resultWho, requestCode, 0, null, options, user.getIdentifier()); checkStartActivityResult(result, intent); @@ -1977,11 +1977,11 @@ public class Instrumentation { intent.migrateExtraStreamToClipData(who); intent.prepareToLeaveProcess(who); int result = ActivityTaskManager.getService() - .startActivityAsCaller(whoThread, who.getBasePackageName(), intent, - intent.resolveTypeIfNeeded(who.getContentResolver()), - token, target != null ? target.mEmbeddedID : null, - requestCode, 0, null, options, permissionToken, - ignoreTargetSecurity, userId); + .startActivityAsCaller(whoThread, who.getOpPackageName(), intent, + intent.resolveTypeIfNeeded(who.getContentResolver()), + token, target != null ? target.mEmbeddedID : null, + requestCode, 0, null, options, permissionToken, + ignoreTargetSecurity, userId); checkStartActivityResult(result, intent); } catch (RemoteException e) { throw new RuntimeException("Failure from system", e); @@ -2023,7 +2023,7 @@ public class Instrumentation { try { intent.migrateExtraStreamToClipData(who); intent.prepareToLeaveProcess(who); - int result = appTask.startActivity(whoThread.asBinder(), who.getBasePackageName(), + int result = appTask.startActivity(whoThread.asBinder(), who.getOpPackageName(), who.getAttributionTag(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), options); checkStartActivityResult(result, intent); |