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

Commit 10590995 authored by lei.huang's avatar lei.huang
Browse files

Issue 128275244: Callforward notification didn't dismiss. 

[root cause  ]ImsPhoneMmiCode set call forward state to incorrect IccRecords.
[changes     ]ImsPhoneMmiCode set call forward state to correct IccRecords.
[Issue  address]https://partnerissuetracker.corp.google.com/u/0/issues/128275244

Change-Id: Id8e0a9ebed46a8fa9691ee0e47d76e4592b7768c
parent 5007054a

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

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

                    }

                }