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

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

Merge cherrypicks of [15541536, 15541590, 15541500, 15541501, 15541502,... 

Merge cherrypicks of [15541536, 15541590, 15541500, 15541501, 15541502, 15541503, 15541504, 15541505, 15541611, 15541508, 15541612, 15541591, 15541265, 15541266, 15541267, 15541614, 15541593] into security-aosp-rvc-release

Change-Id: I10b51ed5c398fc0c5bde0c686ffc6578b3cd3b9d
parents 87ca5fbc f367815f

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

+11 −11
Original line number Diff line number Diff line
@@ -886,9 +886,12 @@ public class SubscriptionController extends ISub.Stub { 


        // Now that all security checks passes, perform the operation as ourselves.

        final long identity = Binder.clearCallingIdentity();

        List<SubscriptionInfo> subList;

        try {

            List<SubscriptionInfo> subList = null;

            subList = getSubInfo(null, null);

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

        if (subList != null) {

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

            subList.stream().map(
@@ -899,9 +902,6 @@ public class SubscriptionController extends ISub.Stub { 
            if (VDBG) logd("[getAllSubInfoList]- no info return");

        }

        return subList;

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    @Deprecated