Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 029aeca6 authored by xiyuan.wang's avatar xiyuan.wang Committed by android-build-merger
Browse files

Merge "Fix app crash while adding new user" am: 1e5cd4c3 

am: 5cf3dcd1

Change-Id: I328ca5045b1fabf9f6756cc0265458bda531fccf
parents 603e6e45 5cf3dcd1

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

+4 −0
Original line number Diff line number Diff line
@@ -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 {