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

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

fix the issue that clearCallingIdentity before appops check am: 02bb0cc3

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

Change-Id: I89cefe05e9b3ea7e12cbed6c261ed7e408e27074
parents efab59e0 02bb0cc3
Loading
Loading
Loading
Loading
+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