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

Commit 1354f6e8 authored by Hyunho's avatar Hyunho Committed by Hyunho Shin
Browse files

Fixed NPE problem in UiccCard 

Calling getCardId API before setting the UiccPort map results in the NPE problem.
When the getCardId API is called, it checks to see if the UiccPort map has a value.

Bug: b/270655428
Test: atest UiccCardTest
Change-Id: I734d6f4fd9d3d88fb8c91c0a69e8c325c9fc50b6
parent 8ce793ad

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());

    }

}