Merge "IMS: Fix CF icon issue when enable from UI." (f74d9415) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1221,6 +1221,7 @@ public class ImsPhone extends ImsPhoneBase {
		for (int i = 0, s = infos.length; i < s; i++) {
		if (infos[i].mCondition == ImsUtInterface.CDIV_CF_UNCONDITIONAL) {
		if (r != null) {
		setCallForwardingPreference(infos[i].mStatus == 1);
		r.setVoiceCallForwardingFlag(1, (infos[i].mStatus == 1),
		infos[i].mNumber);
		}
		@@ -1290,9 +1291,11 @@ public class ImsPhone extends ImsPhoneBase {
		IccRecords r = getIccRecords();
		Cf cf = (Cf) ar.userObj;
		if (cf.mIsCfu && ar.exception == null && r != null) {
		setCallForwardingPreference(msg.arg1 == 1);
		r.setVoiceCallForwardingFlag(1, msg.arg1 == 1, cf.mSetCfNumber);
		}
		sendResponse(cf.mOnComplete, null, ar.exception);
		updateCallForwardStatus();
		break;

		case EVENT_GET_CALL_FORWARD_DONE:
		@@ -1301,6 +1304,7 @@ public class ImsPhone extends ImsPhoneBase {
		cfInfos = handleCfQueryResult((ImsCallForwardInfo[])ar.result);
		}
		sendResponse((Message) ar.userObj, cfInfos, ar.exception);
		updateCallForwardStatus();
		break;

		case EVENT_SET_CALL_FORWARD_TIMER_DONE: