Merge "IMS: Fix call forward indicator issue for video calls" into atel.lnx.2.0-dev (8055aee6) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1159,6 +1159,7 @@ public class ImsPhone extends ImsPhoneBase {
		if (infos[i].mServiceClass == (SERVICE_CLASS_DATA_SYNC +
		SERVICE_CLASS_PACKET)) {
		setVideoCallForwardingPreference(infos[i].mStatus == 1);
		notifyCallForwardingIndicator();
		} else if (r != null) {
		setVoiceCallForwardingFlag(r, 1, (infos[i].mStatus == 1),
		infos[i].mNumber);
		@@ -1622,6 +1623,11 @@ public class ImsPhone extends ImsPhoneBase {
		mDefaultPhone.setBroadcastEmergencyCallStateChanges(broadcast);
		}

		@Override
		public void notifyCallForwardingIndicator() {
		mDefaultPhone.notifyCallForwardingIndicator();
		}

		@VisibleForTesting
		public PowerManager.WakeLock getWakeLock() {
		return mWakeLock;

+1 −0

Original line number	Diff line number	Diff line
		@@ -1056,6 +1056,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		if(siToServiceClass(mSib) == (SERVICE_CLASS_PACKET
		+ SERVICE_CLASS_DATA_SYNC)) {
		mPhone.setVideoCallForwardingPreference(cffEnabled);
		mPhone.notifyCallForwardingIndicator();
		} else {
		mPhone.setVoiceCallForwardingFlag(1, cffEnabled, mDialingNumber);
		}