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

Unverified Commit d0983ae3 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r46' into staging/lineage-18.1_merge-android-11.0.0_r46 

Android 11.0.0 Release 46 (RQ3A.211001.001)

* tag 'android-11.0.0_r46':
  fix the issue that clearCallingIdentity before appops check

Change-Id: Id11eca49446879411c8c893c2c6fcd948eaed56e
parents e3d255b7 c91164f3

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

+11 −11
Original line number Diff line number Diff line
@@ -887,9 +887,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(
@@ -900,9 +903,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) {