Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev

This commit is contained in:
Abel Tesfaye
2021-03-09 17:39:50 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 1 deletions

View File

@@ -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