Merge "Fix app crash while adding new user"

am: 1e5cd4c3df Change-Id: I0cb1c3a228b85edb6303d4f6c33037e4f787f550
2017-10-30 18:03:09 +00:00
parent 35a3260b91 1e5cd4c3df
commit 5cf3dcd11c
1 changed files with 4 additions and 0 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -450,6 +450,10 @@ public class UserSettings extends SettingsPreferenceFragment
    private void onUserCreated(int userId) {
        mAddedUserId = userId;
        mAddingUser = false;
+        if (!isResumed()) {
+            Log.w(TAG, "Cannot show dialog after onPause");
+            return;
+        }
        if (mUserManager.getUserInfo(userId).isRestricted()) {
            showDialog(DIALOG_SETUP_PROFILE);
        } else {