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

Commit 4be4793f authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Fix issue where dialed CLIR MMI codes on IMS don't save setting." 

am: 02f7123e

Change-Id: I48459974e68ef73e88e02c13aab89f000ec0ea65
parents 87cd0d3e 02f7123e

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -1278,10 +1278,18 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
                sb.append(mContext.getText(

                sb.append(mContext.getText(

                        com.android.internal.R.string.serviceEnabled));

                        com.android.internal.R.string.serviceEnabled));

            }

            }

            // Record CLIR setting

            if (mSc.equals(SC_CLIR)) {

                mPhone.saveClirSetting(CommandsInterface.CLIR_INVOCATION);

            }

        } else if (isDeactivate()) {

        } else if (isDeactivate()) {

            mState = State.COMPLETE;

            mState = State.COMPLETE;

            sb.append(mContext.getText(

            sb.append(mContext.getText(

                    com.android.internal.R.string.serviceDisabled));

                    com.android.internal.R.string.serviceDisabled));

            // Record CLIR setting

            if (mSc.equals(SC_CLIR)) {

                mPhone.saveClirSetting(CommandsInterface.CLIR_SUPPRESSION);

            }

        } else if (isRegister()) {

        } else if (isRegister()) {

            mState = State.COMPLETE;

            mState = State.COMPLETE;

            sb.append(mContext.getText(

            sb.append(mContext.getText(