commit fe8a4c8ce8844255d904a0cf63baf0051b58beb8
author Tyler Gunn <tgunn@google.com> Fri Apr 28 17:58:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 17:58:44 2017 +0000
tree d6b533a190b9e655e8fe00854bafa55a0cd0d05f
parent b00dcbbcdac4f22d3921049ca875d5b791605f17
parent 29e2a3ee8424f5e3e7a9c5aec2f426a1e64477e3

Merge "Add sort order to PhoneAccounts extras"

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 bf927fc..bcc53b5 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -209,11 +209,12 @@
             }
 
             mIsVideoPauseSupported = isCarrierVideoPauseSupported();
-            Bundle instantLetteringExtras = null;
+            Bundle phoneAccountExtras = new Bundle();
             if (isCarrierInstantLetteringSupported()) {
                 capabilities |= PhoneAccount.CAPABILITY_CALL_SUBJECT;
-                instantLetteringExtras = getPhoneAccountExtras();
+                phoneAccountExtras = getPhoneAccountExtras(phoneAccountExtras);
             }
+            phoneAccountExtras.putString(PhoneAccount.EXTRA_SORT_ORDER, String.valueOf(slotId));
             mIsMergeCallSupported = isCarrierMergeCallSupported();
             mIsMergeImsCallSupported = isCarrierMergeImsCallSupported();
             mIsVideoConferencingSupported = isCarrierVideoConferencingSupported();
@@ -269,7 +270,7 @@
                     .setShortDescription(description)
                     .setSupportedUriSchemes(Arrays.asList(
                             PhoneAccount.SCHEME_TEL, PhoneAccount.SCHEME_VOICEMAIL))
-                    .setExtras(instantLetteringExtras)
+                    .setExtras(phoneAccountExtras)
                     .setGroupId(groupId)
                     .build();
 
@@ -385,7 +386,7 @@
         /**
          * @return The {@link PhoneAccount} extras associated with the current subscription.
          */
-        private Bundle getPhoneAccountExtras() {
+        private Bundle getPhoneAccountExtras(Bundle phoneAccountExtras) {
             PersistableBundle b =
                     PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
 
@@ -394,7 +395,6 @@
             String instantLetteringEncoding = b.getString(
                     CarrierConfigManager.KEY_CARRIER_INSTANT_LETTERING_ENCODING_STRING);
 
-            Bundle phoneAccountExtras = new Bundle();
             phoneAccountExtras.putInt(PhoneAccount.EXTRA_CALL_SUBJECT_MAX_LENGTH,
                     instantLetteringMaxLength);
             phoneAccountExtras.putString(PhoneAccount.EXTRA_CALL_SUBJECT_CHARACTER_ENCODING,