Merge "Don't return hidden subscription in getActiveSubIdList" (d2cb5a06) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -2088,7 +2088,7 @@ public class SubscriptionManager {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		subId = iSub.getActiveSubIdList();
		subId = iSub.getActiveSubIdList(/visibleOnly/true);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -2874,7 +2874,7 @@ public class SubscriptionManager {
		*
		* @hide
		*/
		private boolean shouldHideSubscription(SubscriptionInfo info) {
		public boolean shouldHideSubscription(SubscriptionInfo info) {
		if (info == null) return false;

		// If hasCarrierPrivileges or canManageSubscription returns true, it means caller
		@@ -2882,8 +2882,14 @@ public class SubscriptionManager {
		boolean hasCarrierPrivilegePermission = (info.isEmbedded() && canManageSubscription(info))
		\|\| TelephonyManager.from(mContext).hasCarrierPrivileges(info.getSubscriptionId());

		return (!TextUtils.isEmpty(info.getGroupUuid()) && info.isOpportunistic()
		&& !hasCarrierPrivilegePermission);
		return isInvisibleSubscription(info) && !hasCarrierPrivilegePermission;
		}

		/**
		* @hide
		*/
		public static boolean isInvisibleSubscription(SubscriptionInfo info) {
		return info != null && !TextUtils.isEmpty(info.getGroupUuid()) && info.isOpportunistic();
		}

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ interface ISub {
		void clearDefaultsForInactiveSubIds();

		@UnsupportedAppUsage
		int[] getActiveSubIdList();
		int[] getActiveSubIdList(boolean visibleOnly);

		int setSubscriptionProperty(int subId, String propKey, String propValue);