PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix app crash while adding new user" am: 1e5cd4c3df am: 5cf3dcd11c

Browse Source 
am: 029aeca640

Change-Id: I0c10300fd1714d68769473ab28d90177cbf35162
This commit is contained in:
xiyuan.wang
2017-10-30 18:51:13 +00:00
committed by android-build-merger
parent 056ee030c6 029aeca640
commit c8e304aea6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/UserSettings.java
View File

@@ -450,6 +450,10 @@ public class UserSettings extends SettingsPreferenceFragment
private void onUserCreated(int userId) { private void onUserCreated(int userId) {
mAddedUserId = userId; mAddedUserId = userId;
mAddingUser = false; mAddingUser = false;
if (!isResumed()) {
Log.w(TAG, "Cannot show dialog after onPause");
return;
}
if (mUserManager.getUserInfo(userId).isRestricted()) { if (mUserManager.getUserInfo(userId).isRestricted()) {
showDialog(DIALOG_SETUP_PROFILE); showDialog(DIALOG_SETUP_PROFILE);
} else { } else {