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

Commit 41a43563 authored by Pengquan Meng's avatar Pengquan Meng Committed by Android (Google) Code Review
Browse files

Merge "Fixed MMI callback issue"

parents 92192b56 5769d003

src/java/com/android/internal/telephony/gsm/GsmMmiCode.java

+4 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ public final class GsmMmiCode extends Handler implements MmiCode { 
            ret.mSic = makeEmptyNull(m.group(MATCH_GROUP_SIC));

            ret.mPwd = makeEmptyNull(m.group(MATCH_GROUP_PWD_CONFIRM));

            ret.mDialingNumber = makeEmptyNull(m.group(MATCH_GROUP_DIALING_NUMBER));

            ret.mCallbackReceiver = wrappedCallback;



            if(ret.mDialingNumber != null &&

                    ret.mDialingNumber.endsWith("#") &&
@@ -268,6 +267,10 @@ public final class GsmMmiCode extends Handler implements MmiCode { 
            ret.mDialingNumber = dialString;

        }



        if (ret != null) {

            ret.mCallbackReceiver = wrappedCallback;

        }



        return ret;

    }