diff options
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 0bdb0c80d219..0d973d970236 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -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; |