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

Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-12 18:00:48 +00:00
committed by Android (Google) Code Review
parent 896cdfa547 b26cbbd53d
commit 4c452a6534
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2116,29 +2116,36 @@ public class SubscriptionManager {
}
/**
* TODO(b/137102918) Make this static, tests use this as an instance method currently.
*
* @return the list of subId's that are active,
* is never null but the length maybe 0.
* @hide
*/
@UnsupportedAppUsage
public @NonNull int[] getActiveSubscriptionIdList() {
int[] subId = null;
return getActiveSubscriptionIdList(/* visibleOnly */ true);
}
/**
* TODO(b/137102918) Make this static, tests use this as an instance method currently.
*
* @return a non-null list of subId's that are active.
*
* @hide
*/
public @NonNull int[] getActiveSubscriptionIdList(boolean visibleOnly) {
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
subId = iSub.getActiveSubIdList(/*visibleOnly*/true);
int[] subId = iSub.getActiveSubIdList(visibleOnly);
if (subId != null) return subId;
}
} catch (RemoteException ex) {
// ignore it
}
if (subId == null) {
subId = new int[0];
}
return subId;
return new int[0];
}
/**

21
telephony/java/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -600,26 +600,21 @@ public final class TelephonyPermissions {
}
}
/**
* Returns whether the provided uid has carrier privileges for any active subscription ID.
*/
private static boolean checkCarrierPrivilegeForAnySubId(Context context,
Supplier<ITelephony> telephonySupplier, int uid) {
/** Returns whether the provided uid has carrier privileges for any active subscription ID. */
private static boolean checkCarrierPrivilegeForAnySubId(
Context context, Supplier<ITelephony> telephonySupplier, int uid) {
SubscriptionManager sm = (SubscriptionManager) context.getSystemService(
Context.TELEPHONY_SUBSCRIPTION_SERVICE);
int[] activeSubIds = sm.getActiveSubscriptionIdList();
if (activeSubIds != null) {
for (int activeSubId : activeSubIds) {
if (getCarrierPrivilegeStatus(telephonySupplier, activeSubId, uid)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
return true;
}
int[] activeSubIds = sm.getActiveSubscriptionIdList(/* visibleOnly */ false);
for (int activeSubId : activeSubIds) {
if (getCarrierPrivilegeStatus(telephonySupplier, activeSubId, uid)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
return true;
}
}
return false;
}
private static int getCarrierPrivilegeStatus(
Supplier<ITelephony> telephonySupplier, int subId, int uid) {
ITelephony telephony = telephonySupplier.get();