Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a10ebee authored by Alan Stokes's avatar Alan Stokes Committed by android-build-merger
Browse files

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

am: 3701dd06

Change-Id: I17963346c03808d86f80d763b7279149529371cd
parents 41e67f43 3701dd06

services/core/java/com/android/server/am/ActivityManagerConstants.java

+2 −2
Original line number Diff line number Diff line
@@ -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(