PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-08-25 22:09:53 -07:00
committed by Android (Google) Code Review
parent b1491842c4 92e2b4f4af
commit 44120d19f3
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -90,6 +90,11 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package")); mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
mUm = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); mUm = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
if (icicle != null && icicle.containsKey(EXTRA_USER_ID)) {
mUserId = icicle.getInt(EXTRA_USER_ID);
mNewUser = false;
}
if (mUserId == -1) { if (mUserId == -1) {
mUserId = mUm.createUser(getString(R.string.user_new_user_name), 0).id; mUserId = mUm.createUser(getString(R.string.user_new_user_name), 0).id;
} }
@@ -111,6 +116,12 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
} }
} }
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt(EXTRA_USER_ID, mUserId);
}
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (mUserId == 0) { if (mUserId == 0) {