Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e604c562 authored by Abel Tesfaye's avatar Abel Tesfaye Committed by Android (Google) Code Review
Browse files

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

parents c21337d4 a390dc9a

src/com/android/settings/display/ScreenTimeoutSettings.java

+6 −1
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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();