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

@@ -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();