| commit | 8d89dbc5ae6f6039a88f561f8f7311735ea10316 | [log] [tgz] |
|---|---|---|
| author | Elliot Sisteron <elliotsisteron@google.com> | Mon Feb 05 16:59:23 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 05 16:59:23 2024 +0000 |
| tree | e42b5dc8bbf95f25a0d560ec391d1f380f8d1808 | |
| parent | 2904abd561d93308f0f7878d3d4dc1fd3adee618 [diff] | |
| parent | 5418e292c974529d66e828eb5706e634782b3f5c [diff] |
Merge "Fix tests for SecurityAdvancedSettings." into main
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java index 45c1be0..6425833 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java
@@ -41,7 +41,7 @@ public class BatterySaverScheduleRadioButtonsController { private static final String TAG = "BatterySaverScheduleRadioButtonsController"; - public static final int TRIGGER_LEVEL_MIN = 10; + public static final int TRIGGER_LEVEL_MIN = 20; private Context mContext; private BatterySaverScheduleSeekBarController mSeekBarController;
diff --git a/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java b/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java index f6356bc..71d419e 100644 --- a/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/BiometricsSafetySourceTest.java
@@ -114,7 +114,7 @@ @Test public void setSafetySourceData_whenSafetyCenterIsEnabled_withoutBiometrics_setsNullData() { - when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(false); + when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); when(mFingerprintManager.isHardwareDetected()).thenReturn(false); when(mFaceManager.isHardwareDetected()).thenReturn(false);
diff --git a/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java b/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java index 3538727..e528c4e 100644 --- a/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java +++ b/tests/unit/src/com/android/settings/safetycenter/LockScreenSafetySourceTest.java
@@ -413,6 +413,8 @@ when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true); when(mScreenLockPreferenceDetailsUtils.isPasswordQualityManaged(anyInt(), any())) .thenReturn(false); + when(mScreenLockPreferenceDetailsUtils.isLockPatternSecure()).thenReturn(true); + when(mScreenLockPreferenceDetailsUtils.shouldShowGearMenu()).thenReturn(true); LockScreenSafetySource.setSafetySourceData( mApplicationContext, mScreenLockPreferenceDetailsUtils, EVENT_SOURCE_STATE_CHANGED);