From 69ee49c8d1f5e375ab1a2cc445e6dd26edcef236 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Wed, 6 May 2020 12:36:18 -0400 Subject: [PATCH] Fix default for CONTROLS_ENABLED The default value for this setting if it doesn't exist is 1. Test: Robotest PowerMenuPrivacyPreferenceControllerTest Fixes: 155877682 Change-Id: I9025ea9c4f67492220f9ed67e11a167a65a99ec7 --- .../gestures/PowerMenuPrivacyPreferenceController.java | 2 +- .../PowerMenuPrivacyPreferenceControllerTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceController.java b/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceController.java index 29c6176a4f8..ec88ddc01cf 100644 --- a/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceController.java +++ b/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceController.java @@ -86,7 +86,7 @@ public class PowerMenuPrivacyPreferenceController extends TogglePreferenceContro final ContentResolver resolver = mContext.getContentResolver(); boolean cardsAvailable = Settings.Secure.getInt(resolver, CARDS_AVAILABLE_KEY, 0) != 0; boolean cardsEnabled = Settings.Secure.getInt(resolver, CARDS_ENABLED_KEY, 0) != 0; - boolean controlsEnabled = Settings.Secure.getInt(resolver, CONTROLS_ENABLED_KEY, 0) != 0; + boolean controlsEnabled = Settings.Secure.getInt(resolver, CONTROLS_ENABLED_KEY, 1) != 0; return (cardsAvailable && cardsEnabled) || controlsEnabled; } diff --git a/tests/robotests/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceControllerTest.java index 7891d2f9427..32048a157d8 100644 --- 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); + } }