Merge "Stop relying on PACKAGE_VERIFIER_ENABLE."

This commit is contained in:
Alan Stokes
2019-11-25 11:27:51 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 26 deletions

View File

@@ -129,17 +129,6 @@ public class VerifyAppsOverUsbPreferenceControllerTest {
verify(mPreference).setChecked(false);
}
@Test
public void updateState_verifierOff_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(true);
setupEnforcedAdmin(null);
mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_ENABLE, 0 /* setting disabled */);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(false);
@@ -196,4 +185,4 @@ public class VerifyAppsOverUsbPreferenceControllerTest {
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF);
}
}
}