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

Commit e8011bd7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Renamed methods for clatification" am: f8db4fe1 am: e3caa55d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2470984



Change-Id: I50685a28afe2d6d295c97ff344d61e68acca07ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2839e58 e3caa55d

telephony/java/android/telephony/SubscriptionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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

telephony/java/com/android/internal/telephony/ISub.aidl

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ interface ISub { 


    int getSlotIndex(int subId);



    int[] getSubId(int slotIndex);

    int[] getSubIds(int slotIndex);



    int getDefaultSubId();