commit d5d2dd9a546865586185ecfa7ae8b64613b76e4f
author Srikanth Chintala <srikchin@codeaurora.org> Thu Jun 23 16:02:33 2016 +0530
committer Tyler Gunn <tgunn@google.com> Thu Apr 27 13:10:41 2017 -0700
tree 6de58cf0a28dd7e58b79d30e0aa6e315066c4d8f
parent ca07fbe6fef7b587dd7305e55d0e588d6af2ca3b

PhoneAccounts sorting

Any time a PhoneAccount is added to the mState,
perform a sort

Sort order is:
a) Sort CAPABILITY_SIM_SUBSCRIPTION PhoneAccounts
b) Sort by EXTRA_SORT_ORDER
c) Sort by PHoneAccount label.

In case of phone account re-registration in Telecomm,
old account was getting removed and updated account
was getting appended. So, the order of PhoneAccount
was getting changed with the fix this case will
be handled.

Bug: 34872161
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc

src/com/android/server/telecom/PhoneAccountRegistrar.java

diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java
index 8cdec30..179517b 100644
--- a/src/com/android/server/telecom/PhoneAccountRegistrar.java
+++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -73,6 +73,7 @@
 import java.lang.String;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -691,6 +692,36 @@
         }
 
         mState.accounts.add(account);
+        if (mState.accounts.size() > 1) {
+            mState.accounts.sort(new Comparator<PhoneAccount>() {
+                public int compare(PhoneAccount phoneaccount1, PhoneAccount phoneaccount2) {
+                    if (phoneaccount1.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
+                            && phoneaccount2
+                                    .hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+                        int slotId1 = phoneaccount1.getExtras()
+                                .getInt(PhoneAccount.EXTRA_SORT_ORDER);
+                        int slotId2 = phoneaccount2.getExtras()
+                                .getInt(PhoneAccount.EXTRA_SORT_ORDER);
+                        return (slotId1 < slotId2 ? -1 : (slotId1 == slotId2 ? 0 : 1));
+                    } else if (phoneaccount1
+                            .hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
+                            && !phoneaccount2
+                                    .hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+                        return -1;
+                    } else if (!phoneaccount1
+                            .hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
+                            && phoneaccount2
+                                    .hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+                        return 1;
+                    } else {
+                        return nullToEmpty(phoneaccount1.getLabel().toString())
+                                .compareToIgnoreCase(
+                                        nullToEmpty(phoneaccount2.getLabel().toString()));
+                    }
+                }
+            });
+        }
+
         // Set defaults and replace based on the group Id.
         maybeReplaceOldAccount(account);
         // Reset enabled state to whatever the value was if the account was already registered,
@@ -1870,4 +1901,8 @@
             return null;
         }
     };
+
+    private String nullToEmpty(String str) {
+        return str == null ? "" : str;
+    }
 }