Merge "Add Extra Exception Checks to Null Cipher Toggle"
This commit is contained in:
committed by
Android (Google) Code Review
commit
f730f899d8
@@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.spy;
|
||||
@@ -119,6 +120,16 @@ public final class NullAlgorithmsPreferenceControllerTest {
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_telephonyManagerException_conditionallyUnavailable() {
|
||||
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CELLULAR_SECURITY,
|
||||
TelephonyManager.PROPERTY_ENABLE_NULL_CIPHER_TOGGLE, Boolean.TRUE.toString(),
|
||||
false);
|
||||
doThrow(IllegalStateException.class).when(
|
||||
mTelephonyManager).isNullCipherAndIntegrityPreferenceEnabled();
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_returnAvailable() {
|
||||
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CELLULAR_SECURITY,
|
||||
@@ -141,4 +152,12 @@ public final class NullAlgorithmsPreferenceControllerTest {
|
||||
mController.setChecked(false);
|
||||
verify(mTelephonyManager, times(1)).setNullCipherAndIntegrityEnabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_exceptionThrown() {
|
||||
doThrow(IllegalStateException.class).when(
|
||||
mTelephonyManager).setNullCipherAndIntegrityEnabled(true);
|
||||
assertFalse(mController.setChecked(true));
|
||||
verify(mTelephonyManager, times(1)).setNullCipherAndIntegrityEnabled(true);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user