diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-11 13:06:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-11 13:06:45 +0000 |
commit | cade9cb4c67e8cae18377eafc3dd8a84a10cffd6 (patch) | |
tree | b7f8b73b10a414d0bc6b8036d00e8c74b3594bb8 | |
parent | e9bf1b3372a95bc67327fd29bd91b74bc5c080b0 (diff) | |
parent | 8045eba07f71575f67f546599080b7482bf62a32 (diff) | |
download | telephony-android12-mainline-networkstack-release.tar.gz |
Snap for 7905862 from 8045eba07f71575f67f546599080b7482bf62a32 to mainline-networking-releaseandroid-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-release
Change-Id: Icb210f469e02d116495d868a364a437160143979
-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 f03070fa19..49db160450 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()); @@ -3890,8 +3903,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<>(); } |