commit 6f00e7e8abfa7c1f3a0ea4929ddf7c26452405b2
author Andrew Lee <anwlee@google.com> Tue Oct 28 23:00:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 28 23:00:41 2014 +0000
tree ccf044e22081dd2b7a34c635a7ac174c68b3556d
parent 77f67fdfe43559c1b631cde7920c3f78a4835427
parent e3c15213a991df51d35e42926d47a629f55fbb63

Merge "Add list of accounts in Phone Account Settings." into lmp-mr1-dev

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 5a480a5..c5e5a41 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -123,8 +123,10 @@
                 if (record != null) {
                     subDisplayName = record.displayName;
                     slotId = record.slotId;
+
                     // Assign a "fake" color while the underlying Telephony stuff is refactored
-                    color = makeFakeColor(subId);
+                    // Assign PhoneAccount.NO_COLOR to first slot so single-SIM phones are unchanged
+                    color = slotId == 0? PhoneAccount.NO_COLOR : makeFakeColor(subId);
                 }
 
                 String slotIdString;