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

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

Merge "Update comments to reflect correct HAL version" am: b5900989 am: f893f721 

am: ea93dc13

Change-Id: I4ac82076f0d485766f7f2c3b5061813a96db1bb7
parents f841bf0e ea93dc13

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

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ public class UiccProfile extends IccCard { 
        }



        if (mUiccCard instanceof EuiccCard) {

            // for RadioConfig<1.1 eid is not known when the EuiccCard is constructed

            // for RadioConfig<1.2 eid is not known when the EuiccCard is constructed

            ((EuiccCard) mUiccCard).registerForEidReady(mHandler, EVENT_EID_READY, null);

        }
@@ -460,7 +460,7 @@ public class UiccProfile extends IccCard { 
        }



        if (mUiccCard instanceof EuiccCard && ((EuiccCard) mUiccCard).getEid() == null) {

            // for RadioConfig<1.1 the EID is not known when the EuiccCard is constructed

            // for RadioConfig<1.2 the EID is not known when the EuiccCard is constructed

            if (DBG) log("EID is not ready yet.");

            return;

        }

src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public class EuiccCard extends UiccCard { 
        }

    }



    // For RadioConfig<1.1 we don't know the EID when constructing the EuiccCard, so callers may

    // For RadioConfig<1.2 we don't know the EID when constructing the EuiccCard, so callers may

    // need to register to be notified when we have the EID

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected void loadEidAndNotifyRegistrants() {