commit d42a07704c56605633d6f72c46c408e0194eaa18
author mariagpuyol <mariagpuyol@google.com> Thu May 11 18:26:51 2017 -0700
committer Maria Garcia Puyol <mariagpuyol@google.com> Fri May 12 18:40:31 2017 +0000
tree f48a9574e83eeb28944d324f9c4d3108cc86d87e
parent c62747149b9d1c9cd89517c84d0c4959b57cf335

Do not suggest autocompleting the name with the default value 'Owner'

Fixes: 38138381
Fixes: 37727329
Test: runtest --path packages/apps/EmergencyInfo/tests/
Change-Id: Ied514762fce23ee596fd238ec114bf1687e8b4eb

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);
     }