Merge "Fix: change owner name when account setup" into sc-dev

This commit is contained in:
Peter Kalauskas
2021-07-26 14:52:29 +00:00
committed by Android (Google) Code Review

View File

@@ -63,6 +63,9 @@ public class ProfileUpdateReceiver extends BroadcastReceiver {
/** Returns whether the current user name is different from the default one. */ /** Returns whether the current user name is different from the default one. */
private static boolean isCurrentNameInteresting(Context context, UserManager um) { private static boolean isCurrentNameInteresting(Context context, UserManager um) {
if (!um.isUserNameSet()) {
return false;
}
final String currentName = um.getUserName(); final String currentName = um.getUserName();
final String defaultName = um.isRestrictedProfile() || um.isProfile() ? final String defaultName = um.isRestrictedProfile() || um.isProfile() ?
context.getString(com.android.settingslib.R.string.user_new_profile_name) : context.getString(com.android.settingslib.R.string.user_new_profile_name) :