From 6e5c296bf412fb678097f4cdaa400618aae80a3e Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 11 Nov 2020 13:18:41 -0500
Subject: [PATCH] Fix contact name issue

Contacts don't have to have a display name

Test: manual
Fixes: 172903141
Change-Id: Iabbde4c5f527128c960334997910dba4536fe055
---
 res/values/strings.xml                                      | 3 +++
 .../android/settings/notification/zen/ZenModeBackend.java   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 347e22f2106..b41fd73200a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9166,6 +9166,9 @@
         }
     </string>
 
+    <!-- [CHAR LIMIT=50] Zen mode settings: placeholder for a Contact name when the name is empty -->
+    <string name="zen_mode_starred_contacts_empty_name">(No name)</string>
+
     <!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
     <string name="zen_mode_messages">Messages</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index 1d41bb979a4..e3f5063bf23 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -447,9 +447,9 @@ public class ZenModeBackend {
         if (cursor != null && cursor.moveToFirst()) {
             do {
                 String contact = cursor.getString(0);
-                if (contact != null) {
-                    starredContacts.add(contact);
-                }
+                starredContacts.add(contact != null ? contact :
+                        mContext.getString(R.string.zen_mode_starred_contacts_empty_name));
+
             } while (cursor.moveToNext());
         }
         return starredContacts;