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

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

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

Merge "Issue 128275244: Callforward notification didn't  dismiss." am: c954fda9 am: 11c3dd9f am: 8bee46d5
am: 6ab00c14

Change-Id: Ic7840a31d7a65f6fb48561a14ccf36ec7b0acf80
parents 98be81d9 6ab00c14

src/java/com/android/internal/telephony/Phone.java

+9 −1
Original line number Diff line number Diff line
@@ -1961,7 +1961,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);

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

+2 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,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);

                    }

                }