Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3736682 authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: 495e1a8c 

am: 54e55acf

Change-Id: I9595e6d8487e12795cf1fdaacb77b96c9177332e
parents ba74484c 54e55acf

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

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ public final class TelephonyUtil { 
                int subId2 = telephonyManager.getSubIdForPhoneAccount(account2);

                if (subId1 != SubscriptionManager.INVALID_SUBSCRIPTION_ID &&

                        subId2 != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                    retval = (SubscriptionManager.getSlotId(subId1) <

                            SubscriptionManager.getSlotId(subId2)) ? -1 : 1;

                    retval = (SubscriptionManager.getSlotIndex(subId1) <

                            SubscriptionManager.getSlotIndex(subId2)) ? -1 : 1;

                }



                // Then order by package