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

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

Merge tag 'android-security-10.0.0_r58' into staging/lineage-17.1_merge_android-security-10.0.0_r58 

Android security 10.0.0 release 58

* tag 'android-security-10.0.0_r58':
  [security] SubscriptionGroup is exposed to unprivileged callers
  filter deviceIdentifiers for subscriptionInfo if callers without perm

Change-Id: I9bde22f2ee0430541791b2925ced4c0916063432
parents 9d25b5fc b77a8668

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

+5 −0
Original line number Diff line number Diff line
@@ -709,6 +709,10 @@ public class SubscriptionController extends ISub.Stub { 
            subList = getSubInfo(null, null);

            if (subList != null) {

                if (VDBG) logd("[getAllSubInfoList]- " + subList.size() + " infos return");

                subList.stream().map(

                        subscriptionInfo -> conditionallyRemoveIdentifiers(subscriptionInfo,

                                callingPackage, "getAllSubInfoList"))

                        .collect(Collectors.toList());

            } else {

                if (VDBG) logd("[getAllSubInfoList]- no info return");

            }
@@ -3721,6 +3725,7 @@ public class SubscriptionController extends ISub.Stub { 
        if (!hasIdentifierAccess) {

            result.clearIccId();

            result.clearCardString();

            result.clearGroupUuid();

        }

        return result;

    }