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

Commit 320268b3 authored Jul 27, 2023 by Jack Yu Committed by Automerger Merge Worker Jul 27, 2023

Merge changes from topic "sub_cleanup" into main am: 3b6346b4

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

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

parents c981de01 3b6346b4

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -2624,7 +2624,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
		@@ -2607,11 +2607,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.
		*/