summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-03-04 18:38:23 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-03-04 18:38:23 +0000
commitf8db4fe14c69d20183c76d68c1bcb32b24def128 (patch)
tree240487bd9e563776171207611c7c128d94cbd6ae
parentcd2bdd1e843a92825bdf85a318c7661741af6b49 (diff)
parent9696999d10382d569870d2a74d806ca2db10179e (diff)
Merge "Renamed methods for clatification"
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java2
-rw-r--r--[-rwxr-xr-x]telephony/java/com/android/internal/telephony/ISub.aidl2
2 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 29e6837ea721..713522b6ba8f 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();