From 303c31f492e0bda15fa4116b60655263b9533143 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Mon, 20 May 2019 17:18:26 +0100 Subject: [PATCH] Background activity starts are now blocked by default. Change the default for "Allow background activity starts" to off, matching the logic in the activity manager. Bug: 129955487 Bug: 129533810 Test: make RunSettingsRoboTests \ ROBOTEST_FILTER=AllowBackgroundActivityStartsPreferenceControllerTest Change-Id: If9eeae699f9c8b7913da4456a45286f816cc7463 --- .../AllowBackgroundActivityStartsPreferenceController.java | 4 ++-- ...AllowBackgroundActivityStartsPreferenceControllerTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java b/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java index 4aaa4906335..81efaa6d157 100644 --- a/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java +++ b/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceController.java @@ -82,10 +82,10 @@ public class AllowBackgroundActivityStartsPreferenceController private boolean isDefaultEnabled() { // 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( DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED, - /*defaultValue*/ true); + /*defaultValue*/ false); } } diff --git a/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java index afe08489503..81658628897 100644 --- a/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java @@ -115,7 +115,7 @@ public class AllowBackgroundActivityStartsPreferenceControllerTest { public void onDeveloperOptionsSwitchDisabled_noDefault_shouldResetPreference() { mController.onDeveloperOptionsSwitchDisabled(); - verify(mPreference).setChecked(true); + verify(mPreference).setChecked(false); verify(mPreference).setEnabled(false); assertThat(getModeFroMSettings()).isEqualTo(-1);