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

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

Browse Source 
Change-Id: I52e968e2d8f3bfa63a2b1cef0ca6c38058199de8
This commit is contained in:
Fabian Kozynski
2020-05-07 14:38:59 +00:00
committed by Automerger Merge Worker
parent df294e4f57 8d36410fa5
commit 1cefc2e23b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/PowerMenuPrivacyPreferenceController.java
View File

@@ -86,7 +86,7 @@ public class PowerMenuPrivacyPreferenceController extends TogglePreferenceContro
final ContentResolver resolver = mContext.getContentResolver(); final ContentResolver resolver = mContext.getContentResolver();
boolean cardsAvailable = Settings.Secure.getInt(resolver, CARDS_AVAILABLE_KEY, 0) != 0; boolean cardsAvailable = Settings.Secure.getInt(resolver, CARDS_AVAILABLE_KEY, 0) != 0;
boolean cardsEnabled = Settings.Secure.getInt(resolver, CARDS_ENABLED_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; return (cardsAvailable && cardsEnabled) || controlsEnabled;
} }

10
tests/robotests/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceControllerTest.java
View File

@@ -202,4 +202,14 @@ public class PowerMenuPrivacyPreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo( assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.DISABLED_DEPENDENT_SETTING); 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);
}
} }