commit 294cf3f949705241c472263b5a13fe804b937464
author Santos Cordon <santoscordon@google.com> Mon Jul 21 00:02:01 2014 -0700
committer Santos Cordon <santoscordon@google.com> Wed Jul 23 10:41:19 2014 +0000
tree d5d7bb8bcee54e0c4ab871377b9790095a1a253c
parent 3b45f1cc3f70101374cf79e047c6d2eb31cbe159

Change display Strings to CharSequence (2/3)

Bug: 16416927
Change-Id: Id8b6e5029a8a1f61bbbf71661abe4d487c01002a

src/com/android/telecomm/PhoneAccountPreferencesActivity.java

diff --git a/src/com/android/telecomm/PhoneAccountPreferencesActivity.java b/src/com/android/telecomm/PhoneAccountPreferencesActivity.java
index ae01497..e4c62e7 100644
--- a/src/com/android/telecomm/PhoneAccountPreferencesActivity.java
+++ b/src/com/android/telecomm/PhoneAccountPreferencesActivity.java
@@ -61,10 +61,10 @@
             int selectedIndex = accountHandles.size();  // Points to "ask every time" by default
             int i = 0;
             for ( ; i < accountHandles.size(); i++) {
-                entryValues[i] = Integer.toString(i);
-                entries[i] = mRegistrar
-                        .getPhoneAccount(accountHandles.get(i))
+                CharSequence label = mRegistrar.getPhoneAccount(accountHandles.get(i))
                         .getLabel();
+                entries[i] = label == null ? null : label.toString();
+                entryValues[i] = Integer.toString(i);
                 if (Objects.equals(currentDefault, accountHandles.get(i))) {
                     selectedIndex = i;
                 }