Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index 24bcde8..abb616a 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -75,6 +75,9 @@
     AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
 
     @Mock
+    AdaptiveSleepBatterySaverPreferenceController mAdaptiveSleepBatterySaverPreferenceController;
+
+    @Mock
     Preference mDisableOptionsPreference;
 
     @Before
@@ -103,6 +106,8 @@
         mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
         mSettings.mAdaptiveSleepCameraStatePreferenceController =
                 mAdaptiveSleepCameraStatePreferenceController;
+        mSettings.mAdaptiveSleepBatterySaverPreferenceController =
+                mAdaptiveSleepBatterySaverPreferenceController;
     }
 
     @Test