PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-17 11:32:34 +00:00
committed by Android (Google) Code Review
parent 1a84719041 3d54554521
commit 217740d640
3 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
View File

@@ -103,7 +103,7 @@ public class SimLockPreferenceControllerTest {
setupMockIcc();
final PersistableBundle pb = new PersistableBundle();
pb.putBoolean(CarrierConfigManager.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, true);
when(mCarrierManager.getConfig()).thenReturn(pb);
when(mCarrierManager.getConfigForSubId(anyInt())).thenReturn(pb);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
@@ -114,7 +114,7 @@ public class SimLockPreferenceControllerTest {
when(mUserManager.isAdminUser()).thenReturn(true);
setupMockIcc();
final PersistableBundle pb = new PersistableBundle();
when(mCarrierManager.getConfig()).thenReturn(pb);
when(mCarrierManager.getConfigForSubId(anyInt())).thenReturn(pb);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);