Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."

Browse Source 
am: 8cbe957dba

Change-Id: I372f27a1ee10cd46c5f0633586709ee14cd6e070
This commit is contained in:
Xiangyu/Malcolm Chen
2019-03-12 15:55:53 -07:00
committed by android-build-merger
parent 6623e402b3 8cbe957dba
commit 6dc894e962
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1243,7 +1243,7 @@ public class SubscriptionManager {
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public List<SubscriptionInfo> getActiveSubscriptionInfoList() { public List<SubscriptionInfo> getActiveSubscriptionInfoList() {
return getActiveSubscriptionInfoList(false); return getActiveSubscriptionInfoList(/* userVisibleonly */true);
} }
/** /**
@@ -2866,15 +2866,24 @@ public class SubscriptionManager {
/** /**
* Whether system UI should hide a subscription. If it's a bundled opportunistic * Whether system UI should hide a subscription. If it's a bundled opportunistic
* subscription, it shouldn't show up in anywhere in Settings app, dialer app, * subscription, it shouldn't show up in anywhere in Settings app, dialer app,
* or status bar. * or status bar. Exception is if caller is carrier app, in which case they will
* want to see their own hidden subscriptions.
* *
* @param info the subscriptionInfo to check against. * @param info the subscriptionInfo to check against.
* @return true if this subscription should be hidden. * @return true if this subscription should be hidden.
* *
* @hide * @hide
*/ */
public static boolean shouldHideSubscription(SubscriptionInfo info) { private boolean shouldHideSubscription(SubscriptionInfo info) {
return (info != null && !TextUtils.isEmpty(info.getGroupUuid()) && info.isOpportunistic()); if (info == null) return false;
// If hasCarrierPrivileges or canManageSubscription returns true, it means caller
// has carrier privilege.
boolean hasCarrierPrivilegePermission = (info.isEmbedded() && canManageSubscription(info))
|| TelephonyManager.from(mContext).hasCarrierPrivileges(info.getSubscriptionId());
return (!TextUtils.isEmpty(info.getGroupUuid()) && info.isOpportunistic()
&& !hasCarrierPrivilegePermission);
} }
/** /**