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

Commit 3294a5ba authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "filter deviceIdentifiers for subscriptionInfo if callers without perm" into sc-dev

parents 49c50a94 f6bb9b20

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

+4 −0
Original line number Diff line number Diff line
@@ -920,6 +920,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, callingFeatureId, "getAllSubInfoList"))

                        .collect(Collectors.toList());

            } else {

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

            }