diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-15 17:52:34 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-15 17:52:34 +0000 |
| commit | e6f518c065bb8c63cda50a3557684e1ca70c99af (patch) | |
| tree | e34b9f5a30aff2dd9261851ba0401075fddcc5c5 | |
| parent | d6e8a46beb140b0cc05fb0ee970f6e5f0f531fef (diff) | |
| parent | 96a4a7439cabd634853852903fe71f4a61f5af21 (diff) | |
| download | android_packages_apps_PackageInstaller-e6f518c065bb8c63cda50a3557684e1ca70c99af.tar.gz android_packages_apps_PackageInstaller-e6f518c065bb8c63cda50a3557684e1ca70c99af.tar.bz2 android_packages_apps_PackageInstaller-e6f518c065bb8c63cda50a3557684e1ca70c99af.zip | |
Merge cherrypicks of [8655472, 8655254, 8655915, 8655916, 8655554, 8655935, 8655917, 8655800, 8655789, 8655473, 8655918, 8655474, 8655408, 8655351] into qt-release
Change-Id: If6c7ee763aedea27d9889675e55661ce59b6ee42
| -rw-r--r-- | src/com/android/packageinstaller/role/ui/RequestRoleActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java b/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java index 8b56a221..c57dfef2 100644 --- a/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java +++ b/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java @@ -199,7 +199,9 @@ public class RequestRoleActivity extends FragmentActivity { mRoleName = RoleManager.ROLE_DIALER; mPackageName = null; - String callingPackageName = getCallingPackage(); + // Intent.EXTRA_CALLING_PACKAGE is set in PermissionPolicyService.Internal + // .isActionRemovedForCallingPackage() and can be trusted. + String callingPackageName = intent.getStringExtra(Intent.EXTRA_CALLING_PACKAGE); String extraPackageName = intent.getStringExtra( TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME); if (Objects.equals(extraPackageName, callingPackageName)) { @@ -240,7 +242,9 @@ public class RequestRoleActivity extends FragmentActivity { mRoleName = RoleManager.ROLE_SMS; mPackageName = null; - String callingPackageName = getCallingPackage(); + // Intent.EXTRA_CALLING_PACKAGE is set in PermissionPolicyService.Internal + // .isActionRemovedForCallingPackage() and can be trusted. + String callingPackageName = intent.getStringExtra(Intent.EXTRA_CALLING_PACKAGE); String extraPackageName = intent.getStringExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME); if (extraPackageName == null) { // Launch the settings activity to show the list. |