From a390dc9a4296a63ba587aaa354fd4e29e55d1484 Mon Sep 17 00:00:00 2001
From: Abel Tesfaye <tesfaye@google.com>
Date: Mon, 8 Mar 2021 21:05:51 +0000
Subject: [PATCH] Fix for NPE in ScreenTimeoutSettingsTest

Test: make RunSettingsRoboTests -j54 ROBOTEST_FILTER=ScreenTimeoutSettings

Bug: 182149244
Change-Id: I22e15c84fa6b0864d35f79df015f1d5b86dec24b
---
 .../android/settings/display/ScreenTimeoutSettings.java    | 7 ++++++-
 .../settings/display/ScreenTimeoutSettingsTest.java        | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index 15b5466ff06..f9bb99ecf0d 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -85,6 +85,12 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
     @VisibleForTesting
     AdaptiveSleepPreferenceController mAdaptiveSleepController;
 
+    public ScreenTimeoutSettings() {
+        super();
+        mMetricsFeatureProvider = FeatureFactory.getFactory(getContext())
+                .getMetricsFeatureProvider();
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -105,7 +111,6 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
         mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy);
         mPrivacyPreference.setSelectable(false);
         mPrivacyPreference.setLayoutResource(R.layout.preference_footer);
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index f0bf95c38fd..771a86359ff 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -40,6 +40,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
@@ -78,6 +79,7 @@ public class ScreenTimeoutSettingsTest {
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest();
         mContext = spy(getApplicationContext());
         mSettings = spy(new ScreenTimeoutSettings());
         mContentResolver = mContext.getContentResolver();