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

Commit 2a10f4b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Change the location of lock"

parents 9dd132f3 204b9d22

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -4425,11 +4425,11 @@ public class SubscriptionController extends ISub.Stub { 
    }

    }





    private void refreshCachedOpportunisticSubscriptionInfoList() {

    private void refreshCachedOpportunisticSubscriptionInfoList() {

        synchronized (mSubInfoListLock) {

            List<SubscriptionInfo> subList = getSubInfo(

            List<SubscriptionInfo> subList = getSubInfo(

                    SubscriptionManager.IS_OPPORTUNISTIC + "=1 AND ("

                    SubscriptionManager.IS_OPPORTUNISTIC + "=1 AND ("

                            + SubscriptionManager.SIM_SLOT_INDEX + ">=0 OR "

                            + SubscriptionManager.SIM_SLOT_INDEX + ">=0 OR "

                            + SubscriptionManager.IS_EMBEDDED + "=1)", null);

                            + SubscriptionManager.IS_EMBEDDED + "=1)", null);

        synchronized (mSubInfoListLock) {

            List<SubscriptionInfo> oldOpptCachedList = mCacheOpportunisticSubInfoList;

            List<SubscriptionInfo> oldOpptCachedList = mCacheOpportunisticSubInfoList;





            if (subList != null) {

            if (subList != null) {