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

Merge "Background activity starts are now blocked by default." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-23 09:43:27 +00:00
committed by Android (Google) Code Review
parent 3da9f727e3 303c31f492
commit 3178ea5f2d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,10 +82,10 @@ public class AllowBackgroundActivityStartsPreferenceController
private boolean isDefaultEnabled() { private boolean isDefaultEnabled() {
// The default in the absence of user preference is settable via DeviceConfig. // The default in the absence of user preference is settable via DeviceConfig.
// Note that the default default is enabled. // Note that the default default is disabled.
return DeviceConfig.getBoolean( return DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED, KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED,
/*defaultValue*/ true); /*defaultValue*/ false);
} }
} }

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

@@ -115,7 +115,7 @@ public class AllowBackgroundActivityStartsPreferenceControllerTest {
public void onDeveloperOptionsSwitchDisabled_noDefault_shouldResetPreference() { public void onDeveloperOptionsSwitchDisabled_noDefault_shouldResetPreference() {
mController.onDeveloperOptionsSwitchDisabled(); mController.onDeveloperOptionsSwitchDisabled();
verify(mPreference).setChecked(true); verify(mPreference).setChecked(false);
verify(mPreference).setEnabled(false); verify(mPreference).setEnabled(false);
assertThat(getModeFroMSettings()).isEqualTo(-1); assertThat(getModeFroMSettings()).isEqualTo(-1);