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

Commit e3caa55d authored Mar 04, 2023 by Treehugger Robot Committed by Automerger Merge Worker Mar 04, 2023

Merge "Renamed methods for clatification" am: f8db4fe1

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>

parents 34d1c0a1 f8db4fe1

telephony/java/android/telephony/SubscriptionManager.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2141,7 +2141,7 @@ public class SubscriptionManager {
	try {		try {
	ISub iSub = TelephonyManager.getSubscriptionService();		ISub iSub = TelephonyManager.getSubscriptionService();
	if (iSub != null) {		if (iSub != null) {
	subId = iSub.getSubId(slotIndex);		subId = iSub.getSubIds(slotIndex);
	}		}
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	// ignore it		// ignore it

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

100755 → 100644

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -244,7 +244,7 @@ interface ISub {

	int getSlotIndex(int subId);		int getSlotIndex(int subId);

	int[] getSubId(int slotIndex);		int[] getSubIds(int slotIndex);

	int getDefaultSubId();		int getDefaultSubId();