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

Commit 57dcd3af authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Minor changes on AccessibilityManagerService for visible bg users:"... 

Merge "Minor changes on AccessibilityManagerService for visible bg users:" into udc-dev am: 6a2dd9b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22717336



Change-Id: I4bb2a8e3a819a90a9651d312c268ad5fb7b58a3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf7980a5 6a2dd9b9

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+15 −7
Original line number Diff line number Diff line
@@ -1443,17 +1443,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            return;

        }

        if (!mVisibleBgUserIds.get(userId)) {

            Slogf.wtf(LOG_TAG, "Cannot change current user to %d as it's not visible "

                    + "(mVisibleUsers=%s)", userId, mVisibleBgUserIds);

            Slogf.wtf(LOG_TAG, "changeCurrentUserForTestAutomationIfNeededLocked(): cannot change "

                    + "current user to %d as it's not visible (mVisibleUsers=%s)",

                    userId, mVisibleBgUserIds);

            return;

        }

        if (mCurrentUserId == userId) {

            Slogf.w(LOG_TAG, "NOT changing current user for test automation purposes as it is "

                    + "already %d", mCurrentUserId);

            Slogf.d(LOG_TAG, "changeCurrentUserForTestAutomationIfNeededLocked(): NOT changing "

                    + "current user for test automation purposes as it is already %d",

                    mCurrentUserId);

            return;

        }

        Slogf.i(LOG_TAG, "Changing current user from %d to %d for test automation purposes",

                mCurrentUserId, userId);

        Slogf.i(LOG_TAG, "changeCurrentUserForTestAutomationIfNeededLocked(): changing current user"

                + " from %d to %d for test automation purposes", mCurrentUserId, userId);

        mRealCurrentUserId = mCurrentUserId;

        switchUser(userId);

    }
@@ -1466,7 +1468,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    + "because device doesn't support visible background users");

            return;

        }

        Slogf.i(LOG_TAG, "Restoring current user to %d after using %d for test automation purposes",

        if (mRealCurrentUserId == UserHandle.USER_CURRENT) {

            Slogf.d(LOG_TAG, "restoreCurrentUserForTestAutomationIfNeededLocked(): ignoring "

                    + "because mRealCurrentUserId is already USER_CURRENT");

            return;

        }

        Slogf.i(LOG_TAG, "restoreCurrentUserForTestAutomationIfNeededLocked(): restoring current "

                + "user to %d after using %d for test automation purposes",

                mRealCurrentUserId, mCurrentUserId);

        int currentUserId = mRealCurrentUserId;

        mRealCurrentUserId = UserHandle.USER_CURRENT;