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

Commit 9769884a authored by Felipe Leme's avatar Felipe Leme
Browse files

Minor changes on AccessibilityManagerService for visible bg users: 

- Don't call switchUser() on restoreCurrentUser...() if not needed.
- Improved logs.

Test: atest CtsUiAutomationTestCases android.app.cts.InstrumentationTest
Test: atest --user-type secondary_user_on_secondary_display CtsUiAutomationTestCases

Bug: 271188189

Change-Id: Ic0e84d53f8a6b20ad028f59149673a1178faaff2
parent 209dc315

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;