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

Reset allow background activity to default on

Browse Source 
Change-Id: Ifeda9bb431b8f0c3bbefb41fb13fa70e15952cce
Fixes: 123029532
Test: robotests
This commit is contained in:
Fan Zhang
2019-01-18 16:10:20 -08:00
parent 31b210017b
commit fb90429930
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java
View File

@@ -62,7 +62,7 @@ public class AllowBackgroundActivityStartsPreferenceController
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
writeSetting(false);
((SwitchPreference) mPreference).setChecked(false);
writeSetting(true);
((SwitchPreference) mPreference).setChecked(true);
}
}

14
tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java
View File

@@ -24,6 +24,9 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,9 +35,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@RunWith(RobolectricTestRunner.class)
public class AllowBackgroundActivityStartsPreferenceControllerTest {
@@ -52,7 +52,7 @@ public class AllowBackgroundActivityStartsPreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mController = new AllowBackgroundActivityStartsPreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
.thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -98,11 +98,7 @@ public class AllowBackgroundActivityStartsPreferenceControllerTest {
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.BACKGROUND_ACTIVITY_STARTS_ENABLED, 1 /* default */);
assertThat(mode).isEqualTo(0);
verify(mPreference).setChecked(false);
verify(mPreference).setChecked(true);
verify(mPreference).setEnabled(false);
}
}