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

Commit 98875615 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Moved some log config. to ActivityTaskManagerDebugConfig (21/n) 

Test: Existing test pass
Bug: 80414790
Change-Id: I0d33b4d325be805ac49a97ea02ad1a10fd1bf24f
parent 342fbe9c

core/java/android/app/ActivityTaskManager.java

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ public class ActivityTaskManager { 
    /** Invalid stack ID. */

    public static final int INVALID_STACK_ID = -1;



    /**

     * Invalid task ID.

     * @hide

     */

    public static final int INVALID_TASK_ID = -1;



    /**

     * Parameter to {@link IActivityTaskManager#setTaskWindowingModeSplitScreenPrimary} which

     * specifies the position of the created docked stack at the top half of the screen if

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

+7 −7
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ import static com.android.server.am.ActivityDisplayProto.FOCUSED_STACK_ID; 
import static com.android.server.am.ActivityDisplayProto.ID;

import static com.android.server.am.ActivityDisplayProto.RESUMED_ACTIVITY;

import static com.android.server.am.ActivityDisplayProto.STACKS;

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

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

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

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

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

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

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_STACK;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_STATES;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_TASKS;

import static com.android.server.am.ActivityTaskManagerDebugConfig.POSTFIX_STACK;

import static com.android.server.am.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.am.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.am.ActivityStack.ActivityState.RESUMED;

import static com.android.server.am.ActivityStackSupervisor.FindTaskResult;

import static com.android.server.am.ActivityStackSupervisor.TAG_STATES;
@@ -73,7 +73,7 @@ import java.util.ArrayList; 
 */

class ActivityDisplay extends ConfigurationContainer<ActivityStack>

        implements WindowContainerListener {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityDisplay" : TAG_AM;

    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityDisplay" : TAG_ATM;

    private static final String TAG_STACK = TAG + POSTFIX_STACK;



    static final int POSITION_TOP = Integer.MAX_VALUE;

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

+0 −49
Original line number Diff line number Diff line
@@ -41,97 +41,48 @@ 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_ANR = true;  // STOPSHIP disable it (b/113252928)

    static final boolean DEBUG_APP = DEBUG_ALL_ACTIVITIES || false;

    static final boolean DEBUG_BACKGROUND_CHECK = DEBUG_ALL || 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_LOCKTASK = DEBUG_ALL || false;

    static final boolean DEBUG_LRU = DEBUG_ALL || false;

    static final boolean DEBUG_MU = DEBUG_ALL || false;

    static final boolean DEBUG_NETWORK = DEBUG_ALL || false;

    static final boolean DEBUG_OOM_ADJ = DEBUG_ALL || false;

    static final boolean DEBUG_OOM_ADJ_REASON = DEBUG_ALL || false;

    static final boolean DEBUG_PAUSE = DEBUG_ALL || false;

    static final boolean DEBUG_POWER = DEBUG_ALL || false;

    static final boolean DEBUG_POWER_QUICK = DEBUG_POWER || false;

    static final boolean DEBUG_PROCESS_OBSERVERS = DEBUG_ALL || false;

    static final boolean DEBUG_PROCESSES = DEBUG_ALL || false;

    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_RECENTS_TRIM_TASKS = DEBUG_RECENTS || 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_SERVICE = DEBUG_ALL || false;

    static final boolean DEBUG_FOREGROUND_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_TRANSITION = DEBUG_ALL || false;

    static final boolean DEBUG_UID_OBSERVERS = DEBUG_ALL || false;

    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_USAGE_STATS = DEBUG_ALL || false;

    static final boolean DEBUG_PERMISSIONS_REVIEW = DEBUG_ALL || false;

    static final boolean DEBUG_WHITELISTS = DEBUG_ALL || false;

    static final boolean DEBUG_METRICS = 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_LOCKTASK = (APPEND_CATEGORY_NAME) ? "_LockTask" : "";

    static final String POSTFIX_LRU = (APPEND_CATEGORY_NAME) ? "_LRU" : "";

    static final String POSTFIX_MU = "_MU";

    static final String POSTFIX_NETWORK = "_Network";

    static final String POSTFIX_OOM_ADJ = (APPEND_CATEGORY_NAME) ? "_OomAdj" : "";

    static final String POSTFIX_PAUSE = (APPEND_CATEGORY_NAME) ? "_Pause" : "";

    static final String POSTFIX_POWER = (APPEND_CATEGORY_NAME) ? "_Power" : "";

    static final String POSTFIX_PROCESS_OBSERVERS = (APPEND_CATEGORY_NAME)

            ? "_ProcessObservers" : "";

    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_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_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_TRANSITION = (APPEND_CATEGORY_NAME) ? "_Transition" : "";

    static final String POSTFIX_UID_OBSERVERS = (APPEND_CATEGORY_NAME)

            ? "_UidObservers" : "";

    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" : "";



}

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

+9 −16
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKUP; 
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST;

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

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

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

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

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

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_CONFIGURATION;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_LOCKTASK;

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

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

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_NETWORK;
@@ -114,15 +114,15 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESS_OBS 
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROVIDER;

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

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

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

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;

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

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

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

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

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

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

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

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

import static com.android.server.am.ActivityTaskManagerDebugConfig.POSTFIX_CONFIGURATION;

import static com.android.server.am.ActivityTaskManagerDebugConfig.POSTFIX_LOCKTASK;

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

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

import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_NETWORK;
@@ -133,7 +133,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROCESS_O 
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROVIDER;

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

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

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

import static com.android.server.am.ActivityTaskManagerDebugConfig.POSTFIX_SWITCH;

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

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

import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
@@ -201,7 +201,6 @@ import android.content.IntentFilter; 
import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo.HiddenApiEnforcementPolicy;

import android.content.pm.ConfigurationInfo;

import android.content.pm.IPackageDataObserver;

import android.content.pm.IPackageManager;

import android.content.pm.InstrumentationInfo;
@@ -431,7 +430,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    static final boolean MONITOR_THREAD_CPU_USAGE = false;















    // The flags that are set for all calls we make to the package manager.













    static final int STOCK_PM_FLAGS = PackageManager.GET_SHARED_LIBRARY_FILES;













    public static final int STOCK_PM_FLAGS = PackageManager.GET_SHARED_LIBRARY_FILES;





























    static final String SYSTEM_DEBUGGABLE = "ro.debuggable";
























@@ -461,7 +460,7 @@ public class ActivityManagerService extends IActivityManager.Stub













    // Must be kept in sync with Am.















    private static final int INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS = 1 << 0;



























    static final int MY_PID = myPid();













    public static final int MY_PID = myPid();





























    static final String[] EMPTY_STRING_ARRAY = new String[0];























@@ -482,9 +481,6 @@ public class ActivityManagerService extends IActivityManager.Stub













    private static final String INTENT_REMOTE_BUGREPORT_FINISHED =















            "com.android.internal.intent.action.REMOTE_BUGREPORT_FINISHED";



























    // Used to indicate that an app transition should be animated.













    static final boolean ANIMATE = true;



























    // If set, we will push process association information in to procstats.















    static final boolean TRACK_PROCSTATS_ASSOCIATIONS = true;
























@@ -1423,10 +1419,7 @@ public class ActivityManagerService extends IActivityManager.Stub













    static final int SERVICE_FOREGROUND_CRASH_MSG = 69;















    static final int DISPATCH_OOM_ADJ_OBSERVER_MSG = 70;



























    static final int FIRST_ACTIVITY_STACK_MSG = 100;















    static final int FIRST_BROADCAST_QUEUE_MSG = 200;













    static final int FIRST_COMPAT_MODE_MSG = 300;













    static final int FIRST_SUPERVISOR_STACK_MSG = 100;





























    static final String SERVICE_RECORD_KEY = "servicerecord";















































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -23,7 +23,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;













import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;















import static android.view.Display.INVALID_DISPLAY;





























import static com.android.server.am.TaskRecord.INVALID_TASK_ID;













import static android.app.ActivityTaskManager.INVALID_TASK_ID;































import android.app.ActivityManager;















import android.app.ActivityOptions;