commit 36d4a818326493579f8e78c456985b0aff89bd59
author Hall Liu <hallliu@google.com> Thu Oct 22 23:04:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 22 23:04:01 2020 +0000
tree 464cc6d73f3eb3e01a0a6dca79137728d2f3dec8
parent 24c1cf113b213c2e04cf54b3345ca7af025728ce
parent 8db9df53f783bd033ce1bfdbdfa5d4396ce0a380

Merge "Use slot ID directly for phone account sort order"

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 46c245a..0e7c8ed 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -428,8 +428,7 @@
                             .getBoolean(R.bool.config_support_video_calling_fallback));
 
             if (slotId != SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
-                extras.putString(PhoneAccount.EXTRA_SORT_ORDER,
-                    String.valueOf(slotId));
+                extras.putInt(PhoneAccount.EXTRA_SORT_ORDER, slotId);
             }
 
             mIsMergeCallSupported = isCarrierMergeCallSupported();