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

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

Merge "fix the issue that clearCallingIdentity before appops check" into sc-dev

parents 51a08cb6 020d831c

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

+11 −11
Original line number Diff line number Diff line
@@ -917,9 +917,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(
@@ -930,9 +933,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) {