Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp" (a9022938) · Commits · e / os / android_frameworks_opt_telephony

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -1913,6 +1913,19 @@ public class GsmCdmaPhone extends Phone {
		}
		}

		public boolean supports3gppCallForwardingWhileRoaming() {
		CarrierConfigManager configManager = (CarrierConfigManager)
		getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
		PersistableBundle b = configManager.getConfig();
		if (b != null) {
		return b.getBoolean(
		CarrierConfigManager.KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);
		} else {
		// Default value set in CarrierConfigManager
		return true;
		}
		}

		private void onNetworkInitiatedUssd(MmiCode mmi) {
		mMmiCompleteRegistrants.notifyRegistrants(
		new AsyncResult(null, mmi, null));

+11 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.text.TextUtils;
		import android.telephony.Rlog;

		import static com.android.internal.telephony.CommandsInterface.*;
		import com.android.internal.telephony.gsm.SsData;

		import java.util.regex.Pattern;
		import java.util.regex.Matcher;
		@@ -1248,6 +1247,17 @@ public final class GsmMmiCode extends Handler implements MmiCode {
		} else if (err == CommandException.Error.FDN_CHECK_FAILURE) {
		Rlog.i(LOG_TAG, "FDN_CHECK_FAILURE");
		sb.append(mContext.getText(com.android.internal.R.string.mmiFdnError));
		} else if (err == CommandException.Error.MODEM_ERR) {
		// Some carriers do not allow changing call forwarding settings while roaming
		// and will return an error from the modem.
		if (isServiceCodeCallForwarding(mSc)
		&& mPhone.getServiceState().getVoiceRoaming()
		&& !mPhone.supports3gppCallForwardingWhileRoaming()) {
		sb.append(mContext.getText(
		com.android.internal.R.string.mmiErrorWhileRoaming));
		} else {
		sb.append(getErrorMessage(ar));
		}
		} else {
		sb.append(getErrorMessage(ar));
		}