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

Commit e732666e authored Feb 23, 2023 by Jack Yu Committed by Automerger Merge Worker Feb 23, 2023

Merge "Cleaned up the usage of SubscriptionManger.getSubId" into udc-dev am: a4c95294

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21516767

Change-Id: I78e25a00e3e8e77d09cd0d18ee85191be801b385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6f12e630 a4c95294

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -2631,7 +2631,6 @@ public class SubscriptionController extends ISub.Stub {
		* @deprecated
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@Override
		@Deprecated
		public int[] getSubIds(int slotIndex) {
		if (VDBG) printStackTrace("[getSubId]+ slotIndex=" + slotIndex);

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -2632,11 +2632,6 @@ public class SubscriptionManagerService extends ISub.Stub {
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		}

		@Override
		public int[] getSubIds(int slotIndex) {
		return new int[]{getSubId(slotIndex)};
		}

		/**
		* Update default sub id.
		*/