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

Commit 1d744e15 authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Don't kill carrier app when enabling it. 

There's no reason to do this, and if the app is running it will cause
it to suddenly close despite already being enabled.

Bug: 22306627
Change-Id: Ic37ad74f92d50d49b329b8fb70ea171ff447091b
parent 60bc4898

src/java/com/android/internal/telephony/CarrierAppUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ public final class CarrierAppUtils { 
                                + userId);

                        enabledCarrierPackages.add(ai.packageName);

                        packageManager.setApplicationEnabledSetting(packageName,

                                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0, userId,

                                callingPackage);

                                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,

                                PackageManager.DONT_KILL_APP, userId, callingPackage);

                    } else if (ai.enabledSetting ==

                            PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {

                        // If we're already enabled, don't bother re-enabling, but treat the app as

tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java

+4 −4
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,

                mTelephonyManager, USER_ID, CARRIER_APPS);

        Mockito.verify(mPackageManager).setApplicationEnabledSetting(

                CARRIER_APP, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0, USER_ID,

                CALLING_PACKAGE);

                CARRIER_APP, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,

                PackageManager.DONT_KILL_APP, USER_ID, CALLING_PACKAGE);

        Mockito.verify(mPackageManager).grantDefaultPermissionsToEnabledCarrierApps(

                new String[] {appInfo.packageName}, USER_ID);

    }
@@ -175,8 +175,8 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,

                mTelephonyManager, USER_ID, CARRIER_APPS);

        Mockito.verify(mPackageManager).setApplicationEnabledSetting(

                CARRIER_APP, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0, USER_ID,

                CALLING_PACKAGE);

                CARRIER_APP, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,

                PackageManager.DONT_KILL_APP, USER_ID, CALLING_PACKAGE);

        Mockito.verify(mPackageManager).grantDefaultPermissionsToEnabledCarrierApps(

                new String[] {appInfo.packageName}, USER_ID);

    }