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

Commit 4b6112a4 authored Jul 31, 2020 by Peter Wang Committed by Automerger Merge Worker Jul 31, 2020

Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and...

Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c05

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

Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a

parents 7b705597 8ba18c05

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -8932,10 +8932,10 @@ package android.telephony {
		public class SubscriptionManager {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();
		method public boolean canManageSubscription(@NonNull android.telephony.SubscriptionInfo, @NonNull String);
		method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();
		method @NonNull public int[] getActiveSubscriptionIdList();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getActiveSubscriptionIdList();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String);
		method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getCompleteActiveSubscriptionIdList();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);
		method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSubscriptionEnabled(int);

non-updatable-api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -8830,10 +8830,10 @@ package android.telephony {
		public class SubscriptionManager {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();
		method public boolean canManageSubscription(@NonNull android.telephony.SubscriptionInfo, @NonNull String);
		method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();
		method @NonNull public int[] getActiveSubscriptionIdList();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getActiveSubscriptionIdList();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String);
		method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getCompleteActiveSubscriptionIdList();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);
		method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSubscriptionEnabled(int);

services/core/java/com/android/server/TelephonyRegistry.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1457,7 +1457,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		public void notifyCarrierNetworkChange(boolean active) {
		// only CarrierService with carrier privilege rule should have the permission
		int[] subIds = Arrays.stream(SubscriptionManager.from(mContext)
		.getActiveAndHiddenSubscriptionIdList())
		.getCompleteActiveSubscriptionIdList())
		.filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(mContext,
		i)).toArray();
		if (ArrayUtils.isEmpty(subIds)) {

services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ public class NetworkStatsSubscriptionsMonitor extends
		@NonNull
		private List<Integer> getActiveSubIdList(@NonNull SubscriptionManager subscriptionManager) {
		final ArrayList<Integer> ret = new ArrayList<>();
		final int[] ids = subscriptionManager.getActiveAndHiddenSubscriptionIdList();
		final int[] ids = subscriptionManager.getCompleteActiveSubscriptionIdList();
		for (int id : ids) ret.add(id);
		return ret;
		}

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -650,7 +650,7 @@ public final class TelephonyPermissions {
		private static boolean checkCarrierPrivilegeForAnySubId(Context context, int uid) {
		SubscriptionManager sm = (SubscriptionManager) context.getSystemService(
		Context.TELEPHONY_SUBSCRIPTION_SERVICE);
		int[] activeSubIds = sm.getActiveSubscriptionIdList(/* visibleOnly */ false);
		int[] activeSubIds = sm.getCompleteActiveSubscriptionIdList();
		for (int activeSubId : activeSubIds) {
		if (getCarrierPrivilegeStatus(context, activeSubId, uid)
		== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {