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

Commit 897096aa authored by Hyunho Shin's avatar Hyunho Shin Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE problem in UiccCard" into udc-dev

parents 743d56e9 1354f6e8

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

+5 −2
Original line number Diff line number Diff line
@@ -171,8 +171,11 @@ public class UiccCard { 
        if (!TextUtils.isEmpty(mCardId)) {

            return mCardId;

        } else {

            UiccProfile uiccProfile = mUiccPorts.get(TelephonyManager.DEFAULT_PORT_INDEX)

                    .getUiccProfile();

            UiccPort uiccPort = mUiccPorts.get(TelephonyManager.DEFAULT_PORT_INDEX);

            if (uiccPort == null) {

                return null;

            }

            UiccProfile uiccProfile = uiccPort.getUiccProfile();

            return uiccProfile == null ? null : uiccProfile.getIccId();

        }

    }

tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardTest.java

+6 −0
Original line number Diff line number Diff line
@@ -97,4 +97,10 @@ public class UiccCardTest extends TelephonyTest { 
        assertNull(mUiccCard.getUiccPort(INVALID_PORT_ID));

        assertNotNull(mUiccCard.getUiccPort(TelephonyManager.DEFAULT_PORT_INDEX));

    }



    @Test

    @SmallTest

    public void testGetCardId() {

        assertNull(mUiccCard.getCardId());

    }

}