diff options
| author | 2023-03-04 19:05:17 +0000 | |
|---|---|---|
| committer | 2023-03-04 19:05:17 +0000 | |
| commit | e3caa55db1a322214f2659b0851e90b449a6906a (patch) | |
| tree | 22c60e2db78e0e5b22c2cdac19fff10aad8bd433 | |
| parent | 34d1c0a1d9d04a15fcb22115c2e529ba0ebe8b8f (diff) | |
| parent | f8db4fe14c69d20183c76d68c1bcb32b24def128 (diff) | |
Merge "Renamed methods for clatification" am: f8db4fe14c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2470984
Change-Id: I9dccbe76965d62b2f4510f16d81d4ee5914d21ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | telephony/java/com/android/internal/telephony/ISub.aidl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index d1424f905366..6cae95e56a90 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2141,7 +2141,7 @@ public class SubscriptionManager { try { ISub iSub = TelephonyManager.getSubscriptionService(); if (iSub != null) { - subId = iSub.getSubId(slotIndex); + subId = iSub.getSubIds(slotIndex); } } catch (RemoteException ex) { // ignore it diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 4752cca8bd6c..4fef4d7df87f 100755..100644 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -244,7 +244,7 @@ interface ISub { int getSlotIndex(int subId); - int[] getSubId(int slotIndex); + int[] getSubIds(int slotIndex); int getDefaultSubId(); |