Merge "Send the correct CF status to clients after the siminfo is available" (05b29262) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1992,4 +1992,6 @@ public interface Phone {
		public void setLocalCallHold(int lchStatus);

		public boolean isImsVtCallPresent();

		public void notifyCallForwardingIndicator();
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -1476,4 +1476,9 @@ public class PhoneProxy extends Handler implements Phone {
		throws CallStateException {
		return mActivePhone.dial(dialString, videoState, extras);
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ public class SubscriptionController extends ISub.Stub {
		private static int mDefaultPhoneId = 0;

		private static final int EVENT_WRITE_MSISDN_DONE = 1;
		private boolean mCFUpdated = false;

		protected Handler mHandler = new Handler() {
		@Override
		@@ -1688,6 +1689,15 @@ public class SubscriptionController extends ISub.Stub {
		getDefaultVoiceSubId() + " sms = " + getDefaultSmsSubId() +
		" newDds = " + ddsSubId);

		int len = sProxyPhones.length;
		if(mCFUpdated == false) {
		logd("updateUserPrefs: notifyCF indication, ProxyPhones.length=" + len);
		for (int phoneId = 0; phoneId < len; phoneId++) {
		sProxyPhones[phoneId].notifyCallForwardingIndicator();
		mCFUpdated= true;
		}
		}

		}

		/* Returns User Voice Prompt property, enabled or not */