commit 36ad721d3260213ae58ad78a8c6a8ec0932a6f15
author Sanket Padawe <sanketpadawe@google.com> Mon Mar 20 15:05:53 2017 -0700
committer Sanket Padawe <sanketpadawe@google.com> Tue Mar 21 22:30:56 2017 +0000
tree 34208d90d6527b8c8bcc44b8cba18fdaef15e085
parent 943ab48116de0eab2e0501043ee0fb395ddc7cef

Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.

Bug: 35767068
Test: No build failure on update.
Change-Id: I5345fd45f3f5af356f8f033a49c4e512bfc81d66
Merged-in: I5345fd45f3f5af356f8f033a49c4e512bfc81d66

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

diff --git a/src/com/android/server/telecom/TelephonyUtil.java b/src/com/android/server/telecom/TelephonyUtil.java
index 50b8901..a76821a 100644
--- a/src/com/android/server/telecom/TelephonyUtil.java
+++ b/src/com/android/server/telecom/TelephonyUtil.java
@@ -94,8 +94,8 @@
                 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