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

Merge "Don't return hidden subscription in getActiveSubIdList"

Browse Source 
am: d2cb5a0608

Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
This commit is contained in:
Xiangyu/Malcolm Chen
2019-03-12 16:12:05 -07:00
committed by android-build-merger
parent 6dc894e962 d2cb5a0608
commit 851ec326d9
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2088,7 +2088,7 @@ public class SubscriptionManager {
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) { if (iSub != null) {
subId = iSub.getActiveSubIdList(); subId = iSub.getActiveSubIdList(/*visibleOnly*/true);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// ignore it // ignore it
@@ -2874,7 +2874,7 @@ public class SubscriptionManager {
* *
* @hide * @hide
*/ */
private boolean shouldHideSubscription(SubscriptionInfo info) { public boolean shouldHideSubscription(SubscriptionInfo info) {
if (info == null) return false; if (info == null) return false;
// If hasCarrierPrivileges or canManageSubscription returns true, it means caller // If hasCarrierPrivileges or canManageSubscription returns true, it means caller
@@ -2882,8 +2882,14 @@ public class SubscriptionManager {
boolean hasCarrierPrivilegePermission = (info.isEmbedded() && canManageSubscription(info)) boolean hasCarrierPrivilegePermission = (info.isEmbedded() && canManageSubscription(info))
|| TelephonyManager.from(mContext).hasCarrierPrivileges(info.getSubscriptionId()); || TelephonyManager.from(mContext).hasCarrierPrivileges(info.getSubscriptionId());
return (!TextUtils.isEmpty(info.getGroupUuid()) && info.isOpportunistic() return isInvisibleSubscription(info) && !hasCarrierPrivilegePermission;
&& !hasCarrierPrivilegePermission); }
/**
* @hide
*/
public static boolean isInvisibleSubscription(SubscriptionInfo info) {
return info != null && !TextUtils.isEmpty(info.getGroupUuid()) && info.isOpportunistic();
} }
/** /**

2
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -279,7 +279,7 @@ interface ISub {
void clearDefaultsForInactiveSubIds(); void clearDefaultsForInactiveSubIds();
@UnsupportedAppUsage @UnsupportedAppUsage
int[] getActiveSubIdList(); int[] getActiveSubIdList(boolean visibleOnly);
int setSubscriptionProperty(int subId, String propKey, String propValue); int setSubscriptionProperty(int subId, String propKey, String propValue);