commit 549bc3ea8deb7d3e62b685ff8f18f05838f1b7cd
author Sandeep Kunta <skunta@qti.qualcomm.com> Thu Apr 21 14:38:33 2016 +0530
committer Santos Cordon <santoscordon@google.com> Fri Apr 22 11:42:08 2016 -0700
tree 32340bf3e7e05080726f76c03521b7d9f091a37a
parent 14110a108b7b09ca25157190fdfd17ef5b3bc79d

Fix to display accounts in order

Do not sort accounts based on hash code as it changes the order
accounts visible to the user.

Fix: 27106350
Change-Id: I52cd42b60c02d57ad8648e0b9f1876628f0d74a6

src/com/android/phone/settings/PhoneAccountSettingsFragment.java

diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 70e9fad..25c0f95 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -306,6 +306,14 @@
                     retval = isSim1 ? -1 : 1;
                 }
 
+                int subId1 = PhoneUtils.getSubIdForPhoneAccount(account1);
+                int subId2 = PhoneUtils.getSubIdForPhoneAccount(account2);
+                if (subId1 != SubscriptionManager.INVALID_SUBSCRIPTION_ID &&
+                        subId2 != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                    retval = (mSubscriptionManager.getSlotId(subId1) <
+                        mSubscriptionManager.getSlotId(subId2)) ? -1 : 1;
+                }
+
                 // Then order by package
                 if (retval == 0) {
                     String pkg1 = account1.getAccountHandle().getComponentName().getPackageName();