From 7ae8801fba3c1bfc681f04a2805bfa480459d648 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com>
Date: Fri, 23 Jul 2021 12:53:43 -0700
Subject: [PATCH] Fix: change owner name when account setup

When the device is setup with an account the
owner's user name should be updated. This was broken due to
ag/14056085, so we fix it here.

Test: manual (set up new device and make sure name is changed)
Bug: 194510551
Change-Id: Ide5bc525eba17c78f457c2baa131d7cefd4c15dd
---
 src/com/android/settings/users/ProfileUpdateReceiver.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/users/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java
index f80233cce0e..3c3be8b00a9 100644
--- a/src/com/android/settings/users/ProfileUpdateReceiver.java
+++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -63,6 +63,9 @@ public class ProfileUpdateReceiver extends BroadcastReceiver {
 
     /** 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) :