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

Merge "Prevent error due to new API" into rvc-dev am: 5c4ad7091e

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

Change-Id: I1c5e20afc8d16fdf1e209c3d667e18042a87962a
This commit is contained in:
Fabian Kozynski
2020-06-11 13:45:49 +00:00
committed by Automerger Merge Worker
parent 24ec797de4 5c4ad7091e
commit 541a010b1d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
View File

@@ -367,8 +367,14 @@ public class UserSwitcherController implements Dumpable {
int id; int id;
if (record.isGuest && record.info == null) { if (record.isGuest && record.info == null) {
// No guest user. Create one. // No guest user. Create one.
UserInfo guest = mUserManager.createGuest( UserInfo guest;
mContext, mContext.getString(com.android.settingslib.R.string.guest_nickname)); try {
guest = mUserManager.createGuest(mContext,
mContext.getString(com.android.settingslib.R.string.guest_nickname));
} catch (UserManager.UserOperationException e) {
Log.e(TAG, "Couldn't create guest user", e);
return;
}
if (guest == null) { if (guest == null) {
// Couldn't create guest, most likely because there already exists one, we just // Couldn't create guest, most likely because there already exists one, we just
// haven't reloaded the user list yet. // haven't reloaded the user list yet.