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

Commit 87ca5fbc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15151698, 15151719, 15151903, 15151905, 15151907,... 

Merge cherrypicks of [15151698, 15151719, 15151903, 15151905, 15151907, 15151908, 15151950, 15151952, 15151953, 15151954, 15151955, 15151956, 15151958, 15151937, 15151938, 15151939, 15151860, 15151990, 15151977, 15151978, 15151979] into security-aosp-rvc-release

Change-Id: I5443bc56eea0b742c33e09e4f226bcd6c4771a43
parents 1e5e12c7 db51ae56

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

+5 −0
Original line number Diff line number Diff line
@@ -891,6 +891,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");

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

            result.clearIccId();

            result.clearCardString();

            result.clearGroupUuid();

        }

        if (!hasPhoneNumberAccess) {

            result.clearNumber();