From b6fa43d9803511dc7a08cf0f8e89bd6a37c33e9e Mon Sep 17 00:00:00 2001
From: "xiyuan.wang" <xiyuan.wang@sony.com>
Date: Fri, 20 Oct 2017 17:59:58 +0800
Subject: [PATCH] Fix app crash while adding new user

Settings app crashes when tapping Home key while adding new user because
UserSettings#showDialog() is called after onSaveInstanceState().
To fix this issue, a dialog should not be shown after onPause().

Fixes: 68485787
Test: manual - tap Home key while adding new user

Change-Id: I2ddd119b6558927798a52c7977e6fd8137734c93
---
 src/com/android/settings/users/UserSettings.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bef2e9ab7df..ec055f1d504 100644
--- 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 {