Merge "Add a setting for background activity starts enabled state and basic rules for enforcement" (958462ff) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,8 @@ public abstract class ActivityManagerInternal {
		public abstract void ensureBootCompleted();
		public abstract void updateOomLevelsForDisplay(int displayId);
		public abstract boolean isActivityStartsLoggingEnabled();
		/** Returns true if the background activity starts is enabled. */
		public abstract boolean isBackgroundActivityStartsEnabled();
		public abstract void reportCurKeyguardUsageEvent(boolean keyguardShowing);

		/** Input dispatch timeout to a window, start the ANR process. */

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -11042,6 +11042,16 @@ public final class Settings {
		public static final String ACTIVITY_STARTS_LOGGING_ENABLED
		= "activity_starts_logging_enabled";

		/**
		* Feature flag to enable or disable the background activity starts.
		* When disabled, apps aren't allowed to start activities unless they're in the foreground.
		* Type: int (0 for false, 1 for true)
		* Default: 1
		* @hide
		*/
		public static final String BACKGROUND_ACTIVITY_STARTS_ENABLED =
		"background_activity_starts_enabled";

		/**
		* @hide
		* @see com.android.server.appbinding.AppBindingConstants

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ public class SettingsBackupTest {
		Settings.Global.AUTOFILL_MAX_VISIBLE_DATASETS,
		Settings.Global.AUTOFILL_SMART_SUGGESTION_EMULATION_FLAGS,
		Settings.Global.AUTOMATIC_POWER_SAVER_MODE,
		Settings.Global.BACKGROUND_ACTIVITY_STARTS_ENABLED,
		Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,
		Settings.Global.BATTERY_DISCHARGE_THRESHOLD,
		Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,

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

+19 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.am;

		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER_QUICK;

		import android.content.ContentResolver;
		import android.database.ContentObserver;
		import android.net.Uri;
		@@ -26,8 +28,6 @@ import android.util.Slog;

		import java.io.PrintWriter;

		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER_QUICK;

		/**
		* Settings constants that can modify the activity manager's behavior.
		*/
		@@ -222,6 +222,10 @@ final class ActivityManagerConstants extends ContentObserver {
		// Controlled by Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED
		volatile boolean mFlagActivityStartsLoggingEnabled;

		// Indicates whether the background activity starts is enabled.
		// Controlled by Settings.Global.BACKGROUND_ACTIVITY_STARTS_ENABLED
		volatile boolean mFlagBackgroundActivityStartsEnabled;

		private final ActivityManagerService mService;
		private ContentResolver mResolver;
		private final KeyValueListParser mParser = new KeyValueListParser(',');
		@@ -256,6 +260,10 @@ final class ActivityManagerConstants extends ContentObserver {
		private static final Uri ACTIVITY_STARTS_LOGGING_ENABLED_URI = Settings.Global.getUriFor(
		Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED);

		private static final Uri BACKGROUND_ACTIVITY_STARTS_ENABLED_URI =
		Settings.Global.getUriFor(
		Settings.Global.BACKGROUND_ACTIVITY_STARTS_ENABLED);

		public ActivityManagerConstants(ActivityManagerService service, Handler handler) {
		super(handler);
		mService = service;
		@@ -266,8 +274,10 @@ final class ActivityManagerConstants extends ContentObserver {
		mResolver = resolver;
		mResolver.registerContentObserver(ACTIVITY_MANAGER_CONSTANTS_URI, false, this);
		mResolver.registerContentObserver(ACTIVITY_STARTS_LOGGING_ENABLED_URI, false, this);
		mResolver.registerContentObserver(BACKGROUND_ACTIVITY_STARTS_ENABLED_URI, false, this);
		updateConstants();
		updateActivityStartsLoggingEnabled();
		updateBackgroundActivityStartsEnabled();
		}

		public void setOverrideMaxCachedProcesses(int value) {
		@@ -290,6 +300,8 @@ final class ActivityManagerConstants extends ContentObserver {
		updateConstants();
		} else if (ACTIVITY_STARTS_LOGGING_ENABLED_URI.equals(uri)) {
		updateActivityStartsLoggingEnabled();
		} else if (BACKGROUND_ACTIVITY_STARTS_ENABLED_URI.equals(uri)) {
		updateBackgroundActivityStartsEnabled();
		}
		}

		@@ -373,6 +385,11 @@ final class ActivityManagerConstants extends ContentObserver {
		Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED, 0) == 1;
		}

		private void updateBackgroundActivityStartsEnabled() {
		mFlagBackgroundActivityStartsEnabled = Settings.Global.getInt(mResolver,
		Settings.Global.BACKGROUND_ACTIVITY_STARTS_ENABLED, 1) == 1;
		}

		private void updateMaxCachedProcesses() {
		CUR_MAX_CACHED_PROCESSES = mOverrideMaxCachedProcesses < 0
		? MAX_CACHED_PROCESSES : mOverrideMaxCachedProcesses;

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -19204,6 +19204,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		return mConstants.mFlagActivityStartsLoggingEnabled;
		}

		public boolean isBackgroundActivityStartsEnabled() {
		return mConstants.mFlagBackgroundActivityStartsEnabled;
		}

		public void reportCurKeyguardUsageEvent(boolean keyguardShowing) {
		synchronized(ActivityManagerService.this) {
		ActivityManagerService.this.reportGlobalUsageEventLocked(keyguardShowing