| commit | b264d3a9afb273f29fcecf59e8b783c360cd2c68 | [log] [tgz] |
|---|---|---|
| author | Peter Kalauskas <peskal@google.com> | Mon Jul 26 15:23:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 15:23:19 2021 +0000 |
| tree | e0dc00cceccf177af4585b442380ee08e9575fb9 | |
| parent | 0b7c5ed31c6cb9dafafffe8f6989241ce3689f82 [diff] | |
| parent | a7f2f06bd4e7badd28abc0d8682a167669f64e15 [diff] |
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36 am: a7f2f06bd4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999 Change-Id: I348926ec96c0feea6ae941f6e7bf6aef4fd231ae
diff --git a/src/com/android/settings/users/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java index f80233c..3c3be8b 100644 --- a/src/com/android/settings/users/ProfileUpdateReceiver.java +++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -63,6 +63,9 @@ /** Returns whether the current user name is different from the default one. */ private static boolean isCurrentNameInteresting(Context context, UserManager um) { + if (!um.isUserNameSet()) { + return false; + } final String currentName = um.getUserName(); final String defaultName = um.isRestrictedProfile() || um.isProfile() ? context.getString(com.android.settingslib.R.string.user_new_profile_name) :