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

Commit d8eabb08 authored by Arun kumar Voddu's avatar Arun kumar Voddu Committed by Automerger Merge Worker
Browse files

Merge "Introduced Thread safety protected when accessing getAllUiccCardInfos" am: 7685407b 

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



Change-Id: Ia4298d51197f905a99ce5a892e50bd8b1c5df00d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c662abd6 7685407b

src/java/com/android/internal/telephony/uicc/UiccController.java

+45 −43
Original line number Diff line number Diff line
@@ -1216,6 +1216,7 @@ public class UiccController extends Handler { 
     * Returns the UiccCardInfo of all currently inserted UICCs and embedded eUICCs.

     */

    public ArrayList<UiccCardInfo> getAllUiccCardInfos() {

        synchronized (mLock) {

            ArrayList<UiccCardInfo> infos = new ArrayList<>();

            for (int slotIndex = 0; slotIndex < mUiccSlots.length; slotIndex++) {

                final UiccSlot slot = mUiccSlots[slotIndex];
@@ -1266,6 +1267,7 @@ public class UiccController extends Handler { 
            }

            return infos;

        }

    }



    /**

     * Get the card ID of the default eUICC.