Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev am: 07532443ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14629551

Change-Id: I0d1a3aeb5fc2494af81dec11f9b50395e2b5dd57
This commit is contained in:
Yi Jiang
2021-05-19 06:50:59 +00:00
committed by Automerger Merge Worker

View File

@@ -74,6 +74,9 @@ public class ScreenTimeoutSettingsTest {
@Mock @Mock
AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController; AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
@Mock
AdaptiveSleepBatterySaverPreferenceController mAdaptiveSleepBatterySaverPreferenceController;
@Mock @Mock
Preference mDisableOptionsPreference; Preference mDisableOptionsPreference;
@@ -103,6 +106,8 @@ public class ScreenTimeoutSettingsTest {
mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController; mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
mSettings.mAdaptiveSleepCameraStatePreferenceController = mSettings.mAdaptiveSleepCameraStatePreferenceController =
mAdaptiveSleepCameraStatePreferenceController; mAdaptiveSleepCameraStatePreferenceController;
mSettings.mAdaptiveSleepBatterySaverPreferenceController =
mAdaptiveSleepBatterySaverPreferenceController;
} }
@Test @Test