Merge remote-tracking branch 'origin/pi-release' into pi-release
Fixes the snap that didn't happen in PPR1.180606.001.
diff --git a/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java b/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java
index 4b0cb95..2192499 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java
@@ -95,8 +95,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID,
systemCarrierAppsDisabledUntilUsed, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager, Mockito.never()).setSystemAppHiddenUntilInstalled(
- Mockito.anyString(), Mockito.anyBoolean());
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -115,8 +113,6 @@
USER_ID)).thenReturn(appInfo);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager, Mockito.never()).setSystemAppHiddenUntilInstalled(
- Mockito.anyString(), Mockito.anyBoolean());
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -144,8 +140,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager).grantDefaultPermissionsToEnabledCarrierApps(
@@ -167,8 +161,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager).grantDefaultPermissionsToEnabledCarrierApps(
@@ -190,8 +182,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager).grantDefaultPermissionsToEnabledCarrierApps(
@@ -214,8 +204,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager).grantDefaultPermissionsToEnabledCarrierApps(
@@ -241,8 +229,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, true, USER_ID);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
@@ -281,10 +267,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- ASSOCIATED_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, true, USER_ID);
Mockito.verify(mPackageManager).setSystemAppInstallState(
@@ -322,10 +304,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
- Mockito.verify(mPackageManager, Mockito.never()).setSystemAppHiddenUntilInstalled(
- ASSOCIATED_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, true, USER_ID);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
@@ -362,10 +340,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- ASSOCIATED_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, true, USER_ID);
Mockito.verify(mPackageManager).setSystemAppInstallState(
@@ -389,8 +363,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -413,8 +385,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -437,8 +407,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -460,8 +428,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -484,8 +450,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -507,8 +471,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -532,8 +494,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -556,8 +516,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -592,10 +550,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- ASSOCIATED_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, false, USER_ID);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
@@ -632,10 +586,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- ASSOCIATED_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, false, USER_ID);
Mockito.verify(mPackageManager).setSystemAppInstallState(
@@ -674,10 +624,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- ASSOCIATED_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, false, USER_ID);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
@@ -701,8 +647,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager).setSystemAppInstallState(
CARRIER_APP, false, USER_ID);
Mockito.verify(mPackageManager, Mockito.never())
@@ -728,8 +672,6 @@
.thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
mTelephonyManager, mContentResolver, USER_ID, CARRIER_APPS, ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
@@ -754,8 +696,6 @@
CarrierAppUtils.disableCarrierAppsUntilPrivileged(CALLING_PACKAGE, mPackageManager,
null /* telephonyManager */, mContentResolver, USER_ID, CARRIER_APPS,
ASSOCIATED_APPS);
- Mockito.verify(mPackageManager).setSystemAppHiddenUntilInstalled(
- CARRIER_APP, true);
Mockito.verify(mPackageManager, Mockito.never()).setSystemAppInstallState(
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
Mockito.verify(mPackageManager, Mockito.never())
