commit 1e5cd4c3dfb9969e0f5277c8d5bb7e0f75004872
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 30 17:43:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 30 17:43:46 2017 +0000
tree e2dfb630654a1a206703d8032f897d961fd29a6f
parent 3d8b442e8d355172418b95665a099f8e803a72d0
parent b6fa43d9803511dc7a08cf0f8e89bd6a37c33e9e

Merge "Fix app crash while adding new user"

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 {