PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for NPE in ScreenTimeoutSettingsTest

Browse Source 
Test: make RunSettingsRoboTests -j54 ROBOTEST_FILTER=ScreenTimeoutSettings

Bug: 182149244
Change-Id: I22e15c84fa6b0864d35f79df015f1d5b86dec24b
This commit is contained in:
Abel Tesfaye
2021-03-08 21:05:51 +00:00
parent 9481334a6a
commit a390dc9a42
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/display/ScreenTimeoutSettings.java
View File

@@ -85,6 +85,12 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
@VisibleForTesting @VisibleForTesting
AdaptiveSleepPreferenceController mAdaptiveSleepController; AdaptiveSleepPreferenceController mAdaptiveSleepController;
public ScreenTimeoutSettings() {
super();
mMetricsFeatureProvider = FeatureFactory.getFactory(getContext())
.getMetricsFeatureProvider();
}
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
@@ -105,7 +111,6 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy); mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy);
mPrivacyPreference.setSelectable(false); mPrivacyPreference.setSelectable(false);
mPrivacyPreference.setLayoutResource(R.layout.preference_footer); mPrivacyPreference.setLayoutResource(R.layout.preference_footer);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
} }
@Override @Override

2
tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
View File

@@ -40,6 +40,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before; import org.junit.Before;
@@ -78,6 +79,7 @@ public class ScreenTimeoutSettingsTest {
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
mContext = spy(getApplicationContext()); mContext = spy(getApplicationContext());
mSettings = spy(new ScreenTimeoutSettings()); mSettings = spy(new ScreenTimeoutSettings());
mContentResolver = mContext.getContentResolver(); mContentResolver = mContext.getContentResolver();