commit ddaefdd8d4650c6e2cd78a893045e34646656a52
author Nancy Chen <nancychen@google.com> Fri Oct 24 16:28:45 2014 -0700
committer Nancy Chen <nancychen@google.com> Fri Oct 24 17:37:23 2014 -0700
tree 48a9a3190c8001dba5c36943a8bd99af59ea298b
parent b6bf411ab51829c0fe3501942a8fe5f81db6426e

Temporary: set first slot color to NO_COLOR.

Due to change ag/575009, the SIM icon color will be used for the
InCallUI. We don't want the color to change for the single-SIM case, so
we set the first slot to NO_COLOR for now.

Bug: 17971273
Change-Id: I657326893a641cce3cdefb10f579d7f5260ce053

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 6980df8..41eeb6e 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;