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

Commit 6ab00c14 authored Sep 24, 2019 by lei.huang Committed by android-build-merger Sep 24, 2019

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

am: 8bee46d5

Change-Id: I6c3429106455473191c13bf9bf32ece5dc8c7671

parents 90dca06e 8bee46d5

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

+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);

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);
		}
		}