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

Commit 593d8d47 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"... 

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

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



Change-Id: Id68303416e51a9c90d77f9147490c12af3b78eaf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c9635c9 d8eabb08

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.