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

Merge "Minor fixes handling START_USER_SWITCH_UI_MSG:"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-11 17:19:42 +00:00
committed by Android (Google) Code Review
parent 7b1d46ca58 e55688d450
commit 73b0bbd16b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/am/UserController.java
View File

@@ -1630,7 +1630,7 @@ class UserController implements Handler.Callback {
UserInfo currentUserInfo = getUserInfo(currentUserId);
Pair<UserInfo, UserInfo> userNames = new Pair<>(currentUserInfo, targetUserInfo);
mUiHandler.removeMessages(START_USER_SWITCH_UI_MSG);
mUiHandler.sendMessage(mHandler.obtainMessage(
mUiHandler.sendMessage(mUiHandler.obtainMessage(
START_USER_SWITCH_UI_MSG, userNames));
} else {
mHandler.removeMessages(START_USER_SWITCH_FG_MSG);
@@ -2887,13 +2887,18 @@ class UserController implements Handler.Callback {
void showUserSwitchingDialog(UserInfo fromUser, UserInfo toUser,
String switchingFromSystemUserMessage, String switchingToSystemUserMessage) {
if (!mService.mContext.getPackageManager()
if (mService.mContext.getPackageManager()
.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
final Dialog d = new UserSwitchingDialog(mService, mService.mContext, fromUser,
toUser, true /* above system */, switchingFromSystemUserMessage,
switchingToSystemUserMessage);
d.show();
// config_customUserSwitchUi is set to true on Automotive as CarSystemUI is
// responsible to show the UI; OEMs should not change that, but if they do, we
// should at least warn the user...
Slog.w(TAG, "Showing user switch dialog on UserController, it could cause a race "
+ "condition if it's shown by CarSystemUI as well");
}
final Dialog d = new UserSwitchingDialog(mService, mService.mContext, fromUser,
toUser, true /* above system */, switchingFromSystemUserMessage,
switchingToSystemUserMessage);
d.show();
}
void reportGlobalUsageEventLocked(int event) {