Android/frameworks_base
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 
am: 3701dd0616

Change-Id: I23c62968dbccb5c956c26f5c4cdc11ac433e610d
This commit is contained in:
Alan Stokes
2019-05-23 05:12:59 -07:00
committed by android-build-merger
parent c4d5a32d35 3701dd0616
commit 6f52615dd9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerConstants.java
View File

@@ -120,7 +120,7 @@ final class ActivityManagerConstants extends ContentObserver {
/**
* Default value for mFlagBackgroundActivityStartsEnabled if not explicitly set in
* Settings.Global. This allows it to be set experimentally unless it has been
* enabled/disabled in developer options. Defaults to true.
* enabled/disabled in developer options. Defaults to false.
*/
private static final String KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED =
"default_background_activity_starts_enabled";
@@ -497,7 +497,7 @@ final class ActivityManagerConstants extends ContentObserver {
boolean enabledInDeviceConfig = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED,
/*defaultValue*/ true);
/*defaultValue*/ false);
mFlagBackgroundActivityStartsEnabled = enabledInDeviceConfig;
if (!enabledInDeviceConfig) {
whitelistedPackageNames = DeviceConfig.getProperty(