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

Commit 07f470ca authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Use FLAG_UPDATED_SYSTEM_APP 

Use FLAG_UPDATED_SYSTEM_APP find if an app is updated system app
instead of MATCH_FACTORY_ONLY

Bug: 148308979
Test: Unit test for CarrierAppUtils
Change-Id: I5cb5b05d9319489c0106349f977b99e7bc0fefbf
parent baa60673

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

+31 −60
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo("com.example.missing.app",

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(null);

                        | PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(null);

        ArraySet<String> systemCarrierAppsDisabledUntilUsed = new ArraySet<>();

        systemCarrierAppsDisabledUntilUsed.add("com.example.missing.app");

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mTelephonyManager,
@@ -124,8 +123,8 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        ApplicationInfo appInfo = new ApplicationInfo();

        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(appInfo);

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mTelephonyManager,

                mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS, mContext);

        Mockito.verify(mPackageManager, Mockito.never()).setSystemAppState(Mockito.anyString(),
@@ -156,8 +155,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(appInfo);

                        | PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mTelephonyManager,
@@ -183,8 +181,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(appInfo);

                        | PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mTelephonyManager,
@@ -209,8 +206,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(appInfo);

                        | PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mTelephonyManager,
@@ -233,8 +229,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(appInfo);

                        | PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(appInfo);

        Mockito.when(mPackageManager

                .getApplicationEnabledSetting(Mockito.anyString()))

                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
@@ -264,8 +259,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY)).thenReturn(appInfo);

                        | PackageManager.MATCH_SYSTEM_ONLY)).thenReturn(appInfo);

        Mockito.when(mPackageManager

                .getApplicationEnabledSetting(Mockito.anyString()))

                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
@@ -300,8 +294,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        ApplicationInfo associatedAppInfo = new ApplicationInfo();

        associatedAppInfo.packageName = ASSOCIATED_APP;
@@ -309,8 +302,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(ASSOCIATED_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(associatedAppInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
@@ -341,8 +333,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        ApplicationInfo associatedAppInfo = new ApplicationInfo();

        associatedAppInfo.packageName = ASSOCIATED_APP;
@@ -353,8 +344,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(ASSOCIATED_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(null);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
@@ -385,8 +375,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        ApplicationInfo associatedAppInfo = new ApplicationInfo();

        associatedAppInfo.packageName = ASSOCIATED_APP;
@@ -396,8 +385,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(ASSOCIATED_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(associatedAppInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
@@ -425,8 +413,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -453,8 +440,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE,

                null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
@@ -479,8 +465,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -506,8 +491,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE,

                null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
@@ -532,8 +516,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -559,8 +542,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE,

                null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
@@ -586,8 +568,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -614,8 +595,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE,

                null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
@@ -643,8 +623,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        ApplicationInfo associatedAppInfo = new ApplicationInfo();

        associatedAppInfo.packageName = ASSOCIATED_APP;
@@ -654,8 +633,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(ASSOCIATED_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(associatedAppInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -688,8 +666,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        ApplicationInfo associatedAppInfo = new ApplicationInfo();

        associatedAppInfo.packageName = ASSOCIATED_APP;
@@ -699,8 +676,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(ASSOCIATED_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(associatedAppInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -734,8 +710,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        ApplicationInfo associatedAppInfo = new ApplicationInfo();

        associatedAppInfo.packageName = ASSOCIATED_APP;
@@ -744,8 +719,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(ASSOCIATED_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(associatedAppInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -775,8 +749,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE,

                null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
@@ -802,8 +775,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        Mockito.when(mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(CARRIER_APP))

                .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
@@ -832,8 +804,7 @@ public class CarrierAppUtilsTest extends InstrumentationTestCase { 
        Mockito.when(mPackageManager.getApplicationInfo(CARRIER_APP,

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_SYSTEM_ONLY

                        | PackageManager.MATCH_FACTORY_ONLY))

                        | PackageManager.MATCH_SYSTEM_ONLY))

                .thenReturn(appInfo);

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE,

                null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,