Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cfb56184 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r51' into staging/lineage-18.1_merge-android-security-11.0.0_r51 

Android security 11.0.0 release 51

* tag 'android-security-11.0.0_r51':
  filter deviceIdentifiers for subscriptionInfo if callers without perm

Change-Id: I1a853cc522affe00e0a796338e647d74e90efc0f
parents e06372ac f235d517

src/java/com/android/internal/telephony/SubscriptionController.java

+18 −3
Original line number Diff line number Diff line
@@ -875,6 +875,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
@@ -893,9 +906,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());
@@ -3687,8 +3700,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<>();

            }