Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 0f6205e51c am: 8d36410fa5

Change-Id: I52e968e2d8f3bfa63a2b1cef0ca6c38058199de8
2020-05-07 14:38:59 +00:00
parent df294e4f57 8d36410fa5
commit 1cefc2e23b
2 changed files with 11 additions and 1 deletions
--- a/tests/robotests/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceControllerTest.java
@@ -202,4 +202,14 @@ public class PowerMenuPrivacyPreferenceControllerTest {
        assertThat(mController.getAvailabilityStatus()).isEqualTo(
                BasePreferenceController.DISABLED_DEPENDENT_SETTING);
    }
+
+    @Test
+    public void getAvailabilityStatus_controlsDeletedSecure_retursAvailable() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+
+        Settings.Secure.putString(mContentResolver, CONTROLS_ENABLED_KEY, null);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
 }