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

Commit b0fa8e32 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Clear calling identity before querying SIM INFO table" into tm-qpr-dev am: a04bc342 

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



Change-Id: I965c9ea112def96ad64a195cfe918b1094454a99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c688ba21 a04bc342

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

+9 −4
Original line number Diff line number Diff line
@@ -3525,9 +3525,7 @@ public class SubscriptionController extends ISub.Stub { 
        try {

            int ret = setSubscriptionProperty(subId, SubscriptionManager.IS_OPPORTUNISTIC,

                    String.valueOf(opportunistic ? 1 : 0));



            if (ret != 0) notifySubscriptionInfoChanged();



            return ret;

        } finally {

            Binder.restoreCallingIdentity(token);
@@ -3544,8 +3542,15 @@ public class SubscriptionController extends ISub.Stub { 


        SubscriptionManager subManager = (SubscriptionManager)

                mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);

        List<SubscriptionInfo> subInfo = getSubInfo(



        List<SubscriptionInfo> subInfo;

        long token = Binder.clearCallingIdentity();

        try {

            subInfo = getSubInfo(

                    SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "=" + subId, null);

        } finally {

            Binder.restoreCallingIdentity(token);

        }



        try {

            if (!isActiveSubId(subId) && subInfo != null && subInfo.size() == 1