am 83101c83: am 027a8733: am b944fdc1: Merge "Converted more AMS Log calls to... (058650a2) · Commits · e / os / android_frameworks_base

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

+24 −3

Original line number	Diff line number	Diff line
		@@ -41,14 +41,21 @@ class ActivityManagerDebugConfig {
		// Enable all debug log categories.
		static final boolean DEBUG_ALL = false;

		// Enable all debug log categories for activities.
		static final boolean DEBUG_ALL_ACTIVITIES = DEBUG_ALL \|\| false;

		// Available log categories in the activity manager package.
		static final boolean DEBUG_ADD_REMOVE = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_APP = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_BACKUP = DEBUG_ALL \|\| false;
		static final boolean DEBUG_BROADCAST = DEBUG_ALL \|\| false;
		static final boolean DEBUG_BROADCAST_BACKGROUND = DEBUG_BROADCAST \|\| false;
		static final boolean DEBUG_BROADCAST_LIGHT = DEBUG_BROADCAST \|\| false;
		static final boolean DEBUG_CLEANUP = DEBUG_ALL \|\| false;
		static final boolean DEBUG_CONFIGURATION = DEBUG_ALL \|\| false;
		static final boolean DEBUG_CONTAINERS = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_FOCUS = false;
		static final boolean DEBUG_IDLE = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_IMMERSIVE = DEBUG_ALL \|\| false;
		static final boolean DEBUG_LOCKSCREEN = DEBUG_ALL \|\| false;
		static final boolean DEBUG_LOCKTASK = DEBUG_ALL \|\| false;
		@@ -63,10 +70,14 @@ class ActivityManagerDebugConfig {
		static final boolean DEBUG_PROVIDER = DEBUG_ALL \|\| false;
		static final boolean DEBUG_PSS = DEBUG_ALL \|\| false;
		static final boolean DEBUG_RECENTS = DEBUG_ALL \|\| false;
		static final boolean DEBUG_RELEASE = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_RESULTS = DEBUG_ALL \|\| false;
		static final boolean DEBUG_SAVED_STATE = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_SCREENSHOTS = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_SERVICE = DEBUG_ALL \|\| false;
		static final boolean DEBUG_SERVICE_EXECUTING = DEBUG_ALL \|\| false;
		static final boolean DEBUG_STACK = DEBUG_ALL \|\| false;
		static final boolean DEBUG_STATES = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_SWITCH = DEBUG_ALL \|\| false;
		static final boolean DEBUG_TASKS = DEBUG_ALL \|\| false;
		static final boolean DEBUG_THUMBNAILS = DEBUG_ALL \|\| false;
		@@ -75,16 +86,21 @@ class ActivityManagerDebugConfig {
		static final boolean DEBUG_URI_PERMISSION = DEBUG_ALL \|\| false;
		static final boolean DEBUG_USER_LEAVING = DEBUG_ALL \|\| false;
		static final boolean DEBUG_VISIBILITY = DEBUG_ALL \|\| false;
		static final boolean DEBUG_VISIBLE_BEHIND = DEBUG_ALL_ACTIVITIES \|\| false;
		static final boolean DEBUG_USAGE_STATS = DEBUG_ALL \|\| false;

		static final String POSTFIX_ADD_REMOVE = (APPEND_CATEGORY_NAME) ? "_AddRemove" : "";
		static final String POSTFIX_APP = (APPEND_CATEGORY_NAME) ? "_App" : "";
		static final String POSTFIX_BACKUP = (APPEND_CATEGORY_NAME) ? "_Backup" : "";
		static final String POSTFIX_BROADCAST = (APPEND_CATEGORY_NAME) ? "_Broadcast" : "";
		static final String POSTFIX_CLEANUP = (APPEND_CATEGORY_NAME) ? "_Cleanup" : "";
		static final String POSTFIX_CONFIGURATION = (APPEND_CATEGORY_NAME) ? "_Configuration" : "";
		static final String POSTFIX_CONTAINERS = (APPEND_CATEGORY_NAME) ? "_Containers" : "";
		static final String POSTFIX_FOCUS = (APPEND_CATEGORY_NAME) ? "_Focus" : "";
		static final String POSTFIX_IDLE = (APPEND_CATEGORY_NAME) ? "_Idle" : "";
		static final String POSTFIX_IMMERSIVE = (APPEND_CATEGORY_NAME) ? "_Immersive" : "";
		static final String POSTFIX_LOCKSCREEN = (APPEND_CATEGORY_NAME) ? "_LOCKSCREEN" : "";
		static final String POSTFIX_LOCKTASK = (APPEND_CATEGORY_NAME) ? "_LOCKTASK" : "";
		static final String POSTFIX_LOCKSCREEN = (APPEND_CATEGORY_NAME) ? "_LockScreen" : "";
		static final String POSTFIX_LOCKTASK = (APPEND_CATEGORY_NAME) ? "_LockTask" : "";
		static final String POSTFIX_LRU = (APPEND_CATEGORY_NAME) ? "_LRU" : "";
		static final String POSTFIX_MU = "_MU";
		static final String POSTFIX_OOM_ADJ = (APPEND_CATEGORY_NAME) ? "_OomAdj" : "";
		@@ -95,12 +111,16 @@ class ActivityManagerDebugConfig {
		static final String POSTFIX_PROCESSES = (APPEND_CATEGORY_NAME) ? "_Processes" : "";
		static final String POSTFIX_PROVIDER = (APPEND_CATEGORY_NAME) ? "_Provider" : "";
		static final String POSTFIX_PSS = (APPEND_CATEGORY_NAME) ? "_Pss" : "";
		static final String POSTFIX_RESULTS = (APPEND_CATEGORY_NAME) ? "_Results" : "";
		static final String POSTFIX_RECENTS = (APPEND_CATEGORY_NAME) ? "_Recents" : "";
		static final String POSTFIX_RELEASE = (APPEND_CATEGORY_NAME) ? "_Release" : "";
		static final String POSTFIX_RESULTS = (APPEND_CATEGORY_NAME) ? "_Results" : "";
		static final String POSTFIX_SAVED_STATE = (APPEND_CATEGORY_NAME) ? "_SavedState" : "";
		static final String POSTFIX_SCREENSHOTS = (APPEND_CATEGORY_NAME) ? "_Screenshots" : "";
		static final String POSTFIX_SERVICE = (APPEND_CATEGORY_NAME) ? "_Service" : "";
		static final String POSTFIX_SERVICE_EXECUTING =
		(APPEND_CATEGORY_NAME) ? "_ServiceExecuting" : "";
		static final String POSTFIX_STACK = (APPEND_CATEGORY_NAME) ? "_Stack" : "";
		static final String POSTFIX_STATES = (APPEND_CATEGORY_NAME) ? "_States" : "";
		static final String POSTFIX_SWITCH = (APPEND_CATEGORY_NAME) ? "_Switch" : "";
		static final String POSTFIX_TASKS = (APPEND_CATEGORY_NAME) ? "_Tasks" : "";
		static final String POSTFIX_THUMBNAILS = (APPEND_CATEGORY_NAME) ? "_Thumbnails" : "";
		@@ -110,5 +130,6 @@ class ActivityManagerDebugConfig {
		static final String POSTFIX_URI_PERMISSION = (APPEND_CATEGORY_NAME) ? "_UriPermission" : "";
		static final String POSTFIX_USER_LEAVING = (APPEND_CATEGORY_NAME) ? "_UserLeaving" : "";
		static final String POSTFIX_VISIBILITY = (APPEND_CATEGORY_NAME) ? "_Visibility" : "";
		static final String POSTFIX_VISIBLE_BEHIND = (APPEND_CATEGORY_NAME) ? "_VisibleBehind" : "";

		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -281,6 +281,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		private static final String TAG_UID_OBSERVERS = TAG + POSTFIX_UID_OBSERVERS;
		private static final String TAG_URI_PERMISSION = TAG + POSTFIX_URI_PERMISSION;
		private static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY;
		private static final String TAG_VISIBLE_BEHIND = TAG + POSTFIX_VISIBLE_BEHIND;

		/** Control over CPU and battery monitoring */
		// write battery stats every 30 minutes.
		@@ -10838,7 +10839,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		synchronized (this) {
		final ActivityStack stack = ActivityRecord.getStackLocked(token);
		final boolean visible = stack == null ? false : stack.hasVisibleBehindActivity();
		if (ActivityStackSupervisor.DEBUG_VISIBLE_BEHIND) Slog.d(TAG,
		if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG_VISIBLE_BEHIND,
		"isBackgroundVisibleBehind: stack=" + stack + " visible=" + visible);
		return visible;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,11 +72,11 @@ import java.util.Objects;
		*/
		final class ActivityRecord {
		private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityRecord" : TAG_AM;
		private static final String TAG_STATES = TAG + POSTFIX_STATES;
		private static final String TAG_SWITCH = TAG + POSTFIX_SWITCH;
		private static final String TAG_THUMBNAILS = TAG + POSTFIX_THUMBNAILS;

		private static final boolean SHOW_ACTIVITY_START_TIME = true;
		static final boolean DEBUG_SAVED_STATE = ActivityStackSupervisor.DEBUG_SAVED_STATE;
		final public static String RECENTS_PACKAGE_NAME = "com.android.systemui.recents";

		private static final String ATTR_ID = "id";
		@@ -1093,7 +1093,7 @@ final class ActivityRecord {

		static void activityResumedLocked(IBinder token) {
		final ActivityRecord r = ActivityRecord.forTokenLocked(token);
		if (DEBUG_SAVED_STATE) Slog.i(TAG, "Resumed activity; dropping state of: " + r);
		if (DEBUG_SAVED_STATE) Slog.i(TAG_STATES, "Resumed activity; dropping state of: " + r);
		r.icicle = null;
		r.haveState = false;
		}