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

Commit daadf5bc authored by Josh Hou's avatar Josh Hou Committed by Automerger Merge Worker
Browse files

Merge "Add the protection for null pointer exception" am: 0dcd983a am: 8d5db108 am: 967fc66d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1347343

Change-Id: I62a20c5f2052fc6ee3e017226e9b317ebb3eb78c
parents e868f592 967fc66d

src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
            } else if (ar.exception instanceof ImsException) {

                sb.append(getImsErrorMessage(ar));

            }

        } else if ((int)ar.result == CommandsInterface.SS_STATUS_UNKNOWN) {

        } else if (ar.result != null && (int) ar.result == CommandsInterface.SS_STATUS_UNKNOWN) {

            mState = State.FAILED;

            sb = null;

        } else if (isActivate()) {