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

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

Merge cherrypicks of [15541539, 15541507, 15541630, 15541631, 15541613,... 

Merge cherrypicks of [15541539, 15541507, 15541630, 15541631, 15541613, 15541632, 15541633, 15541634, 15541615, 15541592, 15541268, 15541269, 15541651] into security-aosp-qt-release

Change-Id: Ic4e582222802bb3fa0eaca8a7d34b7d1b2544f2c
parents b77a8668 3fe74914

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

+11 −11
Original line number Diff line number Diff line
@@ -687,9 +687,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(
@@ -700,9 +703,6 @@ public class SubscriptionController extends ISub.Stub { 
            if (VDBG) logd("[getAllSubInfoList]- no info return");

        }

        return subList;

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    private List<SubscriptionInfo> makeCacheListCopyWithLock(List<SubscriptionInfo> cacheSubList) {