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

Commit 11c3dd9f authored by lei.huang's avatar lei.huang Committed by android-build-merger
Browse files

Merge "Issue 128275244: Callforward notification didn't dismiss."

am: c954fda9

Change-Id: If54348eeb15ca7c25a17227906bd259e02854dc6
parents 3922525b c954fda9
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,15 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
        }
    }

    protected void setVoiceCallForwardingFlag(IccRecords r, int line, boolean enable,
    /**
     * Set the voice call forwarding flag for GSM/UMTS and the like SIMs
     *
     * @param r to enable/disable
     * @param line to enable/disable
     * @param enable
     * @param number to which CFU is enabled
     */
    public void setVoiceCallForwardingFlag(IccRecords r, int line, boolean enable,
                                              String number) {
        setCallForwardingIndicatorInSharedPref(enable);
        r.setVoiceCallForwardingFlag(line, enable, number);
+2 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,8 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
                if ((ar.exception == null) && (msg.arg1 == 1)) {
                    boolean cffEnabled = (msg.arg2 == 1);
                    if (mIccRecords != null) {
                        mPhone.setVoiceCallForwardingFlag(1, cffEnabled, mDialingNumber);
                        mPhone.setVoiceCallForwardingFlag(mIccRecords,
                                1, cffEnabled, mDialingNumber);
                    }
                }