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

Commit ea788d0c authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

fix the issue that clearCallingIdentity before appops check am: bb73fd02 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15462894

Change-Id: I880e9c0a145884163de213c5a028a81b4d3fa086
parents f6c9fa90 bb73fd02

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

+11 −11
Original line number Diff line number Diff line
@@ -704,9 +704,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(
@@ -717,9 +720,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) {