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

Commit a78c2231 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

Finally give UserController its own logcat tag 

Change UserController's logcat tag to UserController,
instead of ActivityManager. Similarly, UserState is
also freed from ActivityManager's tag.

Test: compiles
Flag: EXEMPT bugfix
Change-Id: I0b7675c72febd1ff87bdecd87da2ac3cb913e206
parent ff5f71d7

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

+1 −3
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ import static android.os.Process.SYSTEM_UID; 


import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__FRAMEWORK_LOCKED_BOOT_COMPLETED;

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

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.ActivityManagerService.MY_PID;

import static com.android.server.am.UserState.STATE_BOOTING;

import static com.android.server.am.UserState.STATE_RUNNING_LOCKED;
@@ -174,7 +172,7 @@ import java.util.function.BiConsumer; 
 * may cause lock inversion.

 */

class UserController implements Handler.Callback {

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

    private static final String TAG = UserController.class.getSimpleName();



    // Amount of time we wait for observers to handle a user switch before

    // giving up on them and dismissing the user switching dialog.

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

+1 −4
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.server.am;



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

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



import android.annotation.UserIdInt;

import android.app.IStopUserCallback;

import android.os.Trace;
@@ -33,7 +30,7 @@ import java.io.PrintWriter; 
import java.util.ArrayList;



public final class UserState {

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

    private static final String TAG = "UserController.UserState";



    // user doesn't exist.

    public static final int STATE_NONE = -1;