Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Turn down dynamic toggle for background restriction policy" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-14 03:00:19 +00:00
committed by Android (Google) Code Review
parent 59c124b755 e62c211fab
commit 59047acea7
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,16 +32,10 @@ import java.io.PrintWriter;
*/ */
final class ActivityManagerConstants extends ContentObserver { final class ActivityManagerConstants extends ContentObserver {
// Key names stored in the settings value. // 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 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; 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. // Maximum number of cached processes we will allow.
public int MAX_CACHED_PROCESSES = DEFAULT_MAX_CACHED_PROCESSES; public int MAX_CACHED_PROCESSES = DEFAULT_MAX_CACHED_PROCESSES;
@@ -115,7 +109,6 @@ final class ActivityManagerConstants extends ContentObserver {
// with defaults. // with defaults.
Slog.e("ActivityManagerConstants", "Bad activity manager config settings", e); 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, MAX_CACHED_PROCESSES = mParser.getInt(KEY_MAX_CACHED_PROCESSES,
DEFAULT_MAX_CACHED_PROCESSES); DEFAULT_MAX_CACHED_PROCESSES);
updateMaxCachedProcesses(); updateMaxCachedProcesses();
@@ -139,9 +132,6 @@ final class ActivityManagerConstants extends ContentObserver {
pw.println("ACTIVITY MANAGER SETTINGS (dumpsys activity settings) " pw.println("ACTIVITY MANAGER SETTINGS (dumpsys activity settings) "
+ Settings.Global.ACTIVITY_MANAGER_CONSTANTS + ":"); + 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.print(" "); pw.print(KEY_MAX_CACHED_PROCESSES); pw.print("=");
pw.println(MAX_CACHED_PROCESSES); pw.println(MAX_CACHED_PROCESSES);

13
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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