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

Commit 61d3e7d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev am:... 

Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev am: 621db815 am: d716be26 am: c83cd18d am: 1feb4b6f

Change-Id: I8f7dbfe48f02856f0627b32377b7b41e7362d65f
parents bcd53f43 1feb4b6f

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

+0 −6
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ class UserController implements Handler.Callback { 
    // when it never calls back.

    private static final int USER_SWITCH_CALLBACKS_TIMEOUT_MS = 5 * 1000;



    // TODO(b/149604218): STOPSHIP remove  this constant and the logcat

    private static final boolean TESTS_NEED_LOGCAT = true;



    // Used for statsd logging with UserLifecycleJourneyReported + UserLifecycleEventOccurred atoms

    private static final long INVALID_SESSION_ID = 0;
@@ -1740,9 +1737,6 @@ class UserController implements Handler.Callback { 
    }



    void continueUserSwitch(UserState uss, int oldUserId, int newUserId) {

        if (TESTS_NEED_LOGCAT) {

            Slog.d(TAG, "Continue user switch oldUser #" + oldUserId + ", newUser #" + newUserId);

        }

        EventLog.writeEvent(EventLogTags.UC_CONTINUE_USER_SWITCH, oldUserId, newUserId);



        if (isUserSwitchUiEnabled()) {