Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6f518c0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8655472, 8655254, 8655915, 8655916, 8655554, 8655935,... 

Merge cherrypicks of [8655472, 8655254, 8655915, 8655916, 8655554, 8655935, 8655917, 8655800, 8655789, 8655473, 8655918, 8655474, 8655408, 8655351] into qt-release

Change-Id: If6c7ee763aedea27d9889675e55661ce59b6ee42
parents d6e8a46b 96a4a743

src/com/android/packageinstaller/role/ui/RequestRoleActivity.java

+6 −2
Original line number Diff line number Diff line
@@ -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.