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

Prevent error due to new API

Browse Source 
UserManager#createGuest will throw instead of returning null. Check for
it and react in the same way.

Test: no test
Bug: 158659165
Change-Id: If2d873e0e45cc20a2b6a5fc6588d9a4af29efb8b
This commit is contained in:
Fabian Kozynski
2020-06-10 16:14:35 -04:00
parent 26bfc5419c
commit 2bc620b607
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;
if (record.isGuest && record.info == null) {
// No guest user. Create one.
UserInfo guest = mUserManager.createGuest(
mContext, mContext.getString(com.android.settingslib.R.string.guest_nickname));
UserInfo guest;
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) {
// Couldn't create guest, most likely because there already exists one, we just
// haven't reloaded the user list yet.