commit 029aeca640f2d3adf8623c2d95c1f1cc12a4cefa
author xiyuan.wang <xiyuan.wang@sony.com> Mon Oct 30 18:17:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 30 18:17:47 2017 +0000
tree 53144d167e9ea167eccaa5e465b5e7ce2e018cf0
parent 603e6e45b09d3e5f127911633ea13b28b03b49cf
parent 5cf3dcd11c67ed707809cf528e9592c2e2f1240b

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

Change-Id: I328ca5045b1fabf9f6756cc0265458bda531fccf

src/com/android/settings/users/UserSettings.java

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bef2e9a..ec055f1 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -450,6 +450,10 @@
     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 {