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

Commit bace02e0 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "isStateUnknown() shall return true if the SIM state is still unknown"... 

Merge "isStateUnknown() shall return true if the SIM state is still unknown" am: 7d447fa0 am: 022264a8
am: fae9aca0

Change-Id: I8d54d263980091be1dacf6b28ee85b1a4483bab5
parents be331b9c fae9aca0

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

+8 −1
Original line number Diff line number Diff line
@@ -201,7 +201,14 @@ public class UiccSlot extends Handler { 
    }



    public boolean isStateUnknown() {

        return (mCardState == null || mCardState == CardState.CARDSTATE_ABSENT) && mStateIsUnknown;

        if (mCardState == null || mCardState == CardState.CARDSTATE_ABSENT) {

            // mStateIsUnknown is valid only in this scenario.

            return mStateIsUnknown;

        }

        // if mUiccCard is null, assume the state to be UNKNOWN for now.

        // The state may be known but since the actual card object is not available,

        // it is safer to return UNKNOWN.

        return mUiccCard == null;

    }



    private void checkIsEuiccSupported() {