diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-11-11 06:29:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-11-11 06:29:33 +0000 |
commit | 837aaaec1eeadd6a4e1ae97f00f25a557e767539 (patch) | |
tree | 4a581cde57f765e22aeb303fd9b3eaeb0f213dfa | |
parent | ff848ef81146dc7a403531b3686bf2699915d646 (diff) | |
parent | 14507754e932c335621bf61a065c94828af151d2 (diff) | |
download | telephony-837aaaec1eeadd6a4e1ae97f00f25a557e767539.tar.gz |
Merge "filter deviceIdentifiers for subscriptionInfo if callers without perm" into sc-qpr1-dev
-rw-r--r-- | src/java/com/android/internal/telephony/SubscriptionController.java | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java index deb52404d2..451c09af2e 100644 --- a/src/java/com/android/internal/telephony/SubscriptionController.java +++ b/src/java/com/android/internal/telephony/SubscriptionController.java @@ -905,6 +905,19 @@ public class SubscriptionController extends ISub.Stub { @Override public List<SubscriptionInfo> getAllSubInfoList(String callingPackage, String callingFeatureId) { + return getAllSubInfoList(callingPackage, callingFeatureId, false); + } + + /** + * @param callingPackage The package making the IPC. + * @param callingFeatureId The feature in the package + * @param skipConditionallyRemoveIdentifier if set, skip removing identifier conditionally + * @return List of all SubscriptionInfo records in database, + * include those that were inserted before, maybe empty but not null. + * @hide + */ + public List<SubscriptionInfo> getAllSubInfoList(String callingPackage, + String callingFeatureId, boolean skipConditionallyRemoveIdentifier) { if (VDBG) logd("[getAllSubInfoList]+"); // This API isn't public, so no need to provide a valid subscription ID - we're not worried @@ -923,9 +936,9 @@ public class SubscriptionController extends ISub.Stub { } finally { Binder.restoreCallingIdentity(identity); } - if (subList != null) { + if (subList != null && !skipConditionallyRemoveIdentifier) { if (VDBG) logd("[getAllSubInfoList]- " + subList.size() + " infos return"); - subList.stream().map( + subList = subList.stream().map( subscriptionInfo -> conditionallyRemoveIdentifiers(subscriptionInfo, callingPackage, callingFeatureId, "getAllSubInfoList")) .collect(Collectors.toList()); @@ -3896,8 +3909,10 @@ public class SubscriptionController extends ISub.Stub { List<SubscriptionInfo> subInfoList; try { + // need to bypass removing identifier check because that will remove the subList without + // group id. subInfoList = getAllSubInfoList(mContext.getOpPackageName(), - mContext.getAttributionTag()); + mContext.getAttributionTag(), true); if (groupUuid == null || subInfoList == null || subInfoList.isEmpty()) { return new ArrayList<>(); } |