commit 16b220da97eff7368302eb1eaf8362056f9a44da
author mariagpuyol <mariagpuyol@google.com> Fri May 12 19:08:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 12 19:08:52 2017 +0000
tree 9aa1c4523e479629ba071827294e96fe48d07e08
parent 02d13adf6d9bb6c92b44d0b31cbb0bf49cb4a32a
parent d42a07704c56605633d6f72c46c408e0194eaa18

Do not suggest autocompleting the name with the default value 'Owner'
am: d42a07704c

Change-Id: I87cb38ec4c8009d9105614cb0deb6305da6280cb

src/com/android/emergency/preferences/NameAutoCompletePreference.java

diff --git a/src/com/android/emergency/preferences/NameAutoCompletePreference.java b/src/com/android/emergency/preferences/NameAutoCompletePreference.java
index 5149a55..d03df27 100644
--- a/src/com/android/emergency/preferences/NameAutoCompletePreference.java
+++ b/src/com/android/emergency/preferences/NameAutoCompletePreference.java
@@ -37,7 +37,8 @@
     private ArrayAdapter createAdapter() {
         UserManager userManager =
                 (UserManager) getContext().getSystemService(Context.USER_SERVICE);
-        String[] autocompleteSuggestions = {userManager.getUserName()};
+        String[] autocompleteSuggestions = userManager.isUserNameSet()
+            ? new String[] {userManager.getUserName()} : new String[] {};
         return new ArrayAdapter<String>(getContext(),
                 android.R.layout.simple_dropdown_item_1line, autocompleteSuggestions);
     }