Merge "Merge "Turn down dynamic toggle for background restriction policy" into... (c1c38553) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -32,16 +32,10 @@ import java.io.PrintWriter;
		*/
		final class ActivityManagerConstants extends ContentObserver {
		// Key names stored in the settings value.
		private static final String KEY_ENFORCE_BG_CHECK = "enforce_bg_check";
		private static final String KEY_MAX_CACHED_PROCESSES = "max_cached_processes";

		private static final boolean DEFAULT_ENFORCE_BG_CHECK = SystemProperties.getBoolean(
		"debug.bgcheck", true);
		private static final int DEFAULT_MAX_CACHED_PROCESSES = 32;

		// Enforce background check on apps targeting O?
		public boolean ENFORCE_BG_CHECK = DEFAULT_ENFORCE_BG_CHECK;

		// Maximum number of cached processes we will allow.
		public int MAX_CACHED_PROCESSES = DEFAULT_MAX_CACHED_PROCESSES;

		@@ -115,7 +109,6 @@ final class ActivityManagerConstants extends ContentObserver {
		// with defaults.
		Slog.e("ActivityManagerConstants", "Bad activity manager config settings", e);
		}
		ENFORCE_BG_CHECK = mParser.getBoolean(KEY_ENFORCE_BG_CHECK, DEFAULT_ENFORCE_BG_CHECK);
		MAX_CACHED_PROCESSES = mParser.getInt(KEY_MAX_CACHED_PROCESSES,
		DEFAULT_MAX_CACHED_PROCESSES);
		updateMaxCachedProcesses();
		@@ -139,9 +132,6 @@ final class ActivityManagerConstants extends ContentObserver {
		pw.println("ACTIVITY MANAGER SETTINGS (dumpsys activity settings) "
		+ Settings.Global.ACTIVITY_MANAGER_CONSTANTS + ":");

		pw.print(" "); pw.print(KEY_ENFORCE_BG_CHECK); pw.print("=");
		pw.println(ENFORCE_BG_CHECK);

		pw.print(" "); pw.print(KEY_MAX_CACHED_PROCESSES); pw.print("=");
		pw.println(MAX_CACHED_PROCESSES);

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

+1 −12

Original line number	Diff line number	Diff line
		@@ -2717,17 +2717,6 @@ public class ActivityManagerService extends IActivityManager.Stub

		mConstants = new ActivityManagerConstants(this, mHandler);

		if (DEBUG_BACKGROUND_CHECK) {
		Slog.d(TAG, "Enforcing O+ bg restrictions: " + mConstants.ENFORCE_BG_CHECK);
		StringBuilder sb = new StringBuilder(200);
		sb.append(" ");
		for (String a : getBackgroundLaunchBroadcasts()) {
		sb.append(' '); sb.append(a);
		}
		Slog.d(TAG, "Background implicit broadcasts:");
		Slog.d(TAG, sb.toString());
		}

		/* static; one-time init here */
		if (sKillHandler == null) {
		sKillThread = new ServiceThread(TAG + ":kill",
		@@ -8309,7 +8298,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Unified app-op and target sdk check
		int appRestrictedInBackgroundLocked(int uid, String packageName, int packageTargetSdk) {
		// Apps that target O+ are always subject to background check
		if (mConstants.ENFORCE_BG_CHECK && packageTargetSdk >= Build.VERSION_CODES.O) {
		if (packageTargetSdk >= Build.VERSION_CODES.O) {
		if (DEBUG_BACKGROUND_CHECK) {
		Slog.i(TAG, "App " + uid + "/" + packageName + " targets O+, restricted");
		}