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

Merge "Fix settings crash on users page on config change"

Browse Source
This commit is contained in:
João Victor Mendes Freire
2022-12-07 13:49:08 +00:00
committed by Android (Google) Code Review
parent f17d3c4697 98c58a00fd
commit 6754d52673
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/users/UserSettings.java
View File

@@ -590,6 +590,7 @@ public class UserSettings extends SettingsPreferenceFragment
}
private void onAddGuestClicked() {
Context context = getContext();
final UserCreatingDialog guestCreatingDialog =
new UserCreatingDialog(getActivity(), /* isGuest= */ true);
guestCreatingDialog.show();
@@ -597,18 +598,18 @@ public class UserSettings extends SettingsPreferenceFragment
ThreadUtils.postOnBackgroundThread(() -> {
mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_USER_GUEST_ADD);
Trace.beginSection("UserSettings.addGuest");
final UserInfo guest = mUserManager.createGuest(getContext());
final UserInfo guest = mUserManager.createGuest(context);
Trace.endSection();
ThreadUtils.postOnMainThread(() -> {
guestCreatingDialog.dismiss();
if (guest == null) {
Toast.makeText(getContext(),
Toast.makeText(context,
com.android.settingslib.R.string.add_guest_failed,
Toast.LENGTH_SHORT).show();
return;
}
openUserDetails(guest, true);
openUserDetails(guest, true, context);
});
});
}
@@ -646,11 +647,15 @@ public class UserSettings extends SettingsPreferenceFragment
}
private void openUserDetails(UserInfo userInfo, boolean newUser) {
openUserDetails(userInfo, newUser, getContext());
}
private void openUserDetails(UserInfo userInfo, boolean newUser, Context context) {
Bundle extras = new Bundle();
extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);
SubSettingLauncher launcher = new SubSettingLauncher(getContext())
SubSettingLauncher launcher = new SubSettingLauncher(context)
.setDestination(UserDetailsSettings.class.getName())
.setArguments(extras)
.setTitleText(userInfo.name)