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

Commit 38adfc22 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change the location of lock" am: 2a10f4b1 am: f76ff849 

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



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

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

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



    private void refreshCachedOpportunisticSubscriptionInfoList() {

        synchronized (mSubInfoListLock) {

            List<SubscriptionInfo> subList = getSubInfo(

                    SubscriptionManager.IS_OPPORTUNISTIC + "=1 AND ("

                            + SubscriptionManager.SIM_SLOT_INDEX + ">=0 OR "

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

        synchronized (mSubInfoListLock) {

            List<SubscriptionInfo> oldOpptCachedList = mCacheOpportunisticSubInfoList;



            if (subList != null) {