Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Felipe Leme
2023-04-18 20:48:56 +00:00
committed by Android (Google) Code Review
parent 77364c5959 9769884a0c
commit 6a2dd9b9ab
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -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;