From 816b1f6edc9cfbb70e5546a11120f06d143354fd Mon Sep 17 00:00:00 2001
From: Yi Jiang <eejiang@google.com>
Date: Tue, 18 May 2021 15:49:56 -0700
Subject: [PATCH] Fixes ScreenTimeoutSettingsTest

The recently added Battery Saver Preference need to be initialized in
order to avoid NPE in testing.

Bug: 188499083
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ib6553bcf9ed86eb46c2e0950064e34439664a1ee
---
 .../android/settings/display/ScreenTimeoutSettingsTest.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index 24bcde871e4..abb616a5e3e 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -74,6 +74,9 @@ public class ScreenTimeoutSettingsTest {
     @Mock
     AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
 
+    @Mock
+    AdaptiveSleepBatterySaverPreferenceController mAdaptiveSleepBatterySaverPreferenceController;
+
     @Mock
     Preference mDisableOptionsPreference;
 
@@ -103,6 +106,8 @@ public class ScreenTimeoutSettingsTest {
         mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
         mSettings.mAdaptiveSleepCameraStatePreferenceController =
                 mAdaptiveSleepCameraStatePreferenceController;
+        mSettings.mAdaptiveSleepBatterySaverPreferenceController =
+                mAdaptiveSleepBatterySaverPreferenceController;
     }
 
     @Test