diff options
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 14 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/ISub.aidl | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 85cd1579635f..1301246f8574 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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(); } /** diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 4a4506f9bf7a..c08da44c1ba6 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -279,7 +279,7 @@ interface ISub { void clearDefaultsForInactiveSubIds(); @UnsupportedAppUsage - int[] getActiveSubIdList(); + int[] getActiveSubIdList(boolean visibleOnly); int setSubscriptionProperty(int subId, String propKey, String propValue); |