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

Commit adee4fe6 authored by Malcolm Chen's avatar Malcolm Chen Committed by android-build-merger
Browse files

Merge "Add null check on UiccProfile before dumping." 

am: f4b46931

Change-Id: Id769538385c2615310b3407fde24cae19dc7e43c
parents 10d8cd0b f4b46931

src/java/com/android/internal/telephony/PhoneFactory.java

+4 −1
Original line number Diff line number Diff line
@@ -454,7 +454,10 @@ public class PhoneFactory { 
            pw.println("++++++++++++++++++++++++++++++++");



            try {

                ((UiccProfile) phone.getIccCard()).dump(fd, pw, args);

                UiccProfile uiccProfile = (UiccProfile) phone.getIccCard();

                if (uiccProfile != null) {

                    uiccProfile.dump(fd, pw, args);

                }

            } catch (Exception e) {

                e.printStackTrace();

            }