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

Commit 8d5db108 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 

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

Change-Id: I423ac74a059361ff264fca592c9646121da6921d
parents 256de851 0dcd983a

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

+1 −1
Original line number Diff line number Diff line
@@ -1369,7 +1369,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()) {