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

Commit f78f8d82 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add mDefaultEuiccCardId logging to locallog" am: e3eba349 am: b71d4556 

am: d1ef611e

Change-Id: Ie1ee049c05d2b8adc718a1bb25226fabd02ef9d8
parents cda089ff d1ef611e

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

+8 −4
Original line number Diff line number Diff line
@@ -840,8 +840,10 @@ public class UiccController extends Handler { 
                    isDefaultEuiccCardIdSet = true;

                    // TODO(b/122738148) the default eUICC should not be removable

                    mDefaultEuiccCardId = convertToPublicCardId(eid);

                    log("Using eid=" + eid + " in slot=" + i + " to set mDefaultEuiccCardId="

                            + mDefaultEuiccCardId);

                    String logStr = "Using eid=" + eid + " in slot=" + i

                            + " to set mDefaultEuiccCardId=" + mDefaultEuiccCardId;

                    sLocalLog.log(logStr);

                    log(logStr);

                }

            }

        }
@@ -982,8 +984,10 @@ public class UiccController extends Handler { 
                || mDefaultEuiccCardId == TEMPORARILY_UNSUPPORTED_CARD_ID) {

            // TODO(b/122738148) the default eUICC should not be removable

            mDefaultEuiccCardId = convertToPublicCardId(eid);

            log("onEidReady: eid=" + eid + " slot=" + slotId + " mDefaultEuiccCardId="

                    + mDefaultEuiccCardId);

            String logStr = "onEidReady: eid=" + eid + " slot=" + slotId + " mDefaultEuiccCardId="

                    + mDefaultEuiccCardId;

            sLocalLog.log(logStr);

            log(logStr);

        }

        ((EuiccCard) card).unregisterForEidReady(this);

    }