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

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

Merge cherrypicks of [15151697, 15151718, 15151899, 15151900, 15151901,... 

Merge cherrypicks of [15151697, 15151718, 15151899, 15151900, 15151901, 15151902, 15151904, 15151906, 15151930, 15151932, 15151933, 15151856, 15151858, 15151388, 15151971, 15151972, 15151973] into security-aosp-qt-release

Change-Id: I78dc27df61c1d95cc54e962406f2d001577436cc
parents 3ee5d139 30ebc474

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

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

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

            result.clearIccId();

            result.clearCardString();

            result.clearGroupUuid();

        }

        return result;

    }