IMS: Add support for STK CC feature
-- Add support to show appropriate error dialogs
related to STK CC errors.
Test: Manual
Bug: 64685331
Change-Id: I419c64c9198ceefed567d039255434304bf6e900
diff --git a/src/com/android/phone/TimeConsumingPreferenceActivity.java b/src/com/android/phone/TimeConsumingPreferenceActivity.java
index 05b86a5..e626a53 100644
--- a/src/com/android/phone/TimeConsumingPreferenceActivity.java
+++ b/src/com/android/phone/TimeConsumingPreferenceActivity.java
@@ -1,7 +1,5 @@
package com.android.phone;
-import com.android.internal.telephony.CommandException;
-
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
@@ -11,6 +9,8 @@
import android.util.Log;
import android.view.WindowManager;
+import com.android.internal.telephony.CommandException;
+
import java.util.ArrayList;
interface TimeConsumingPreferenceListener {
@@ -53,6 +53,7 @@
static final int STK_CC_SS_TO_DIAL_ERROR = 700;
static final int STK_CC_SS_TO_USSD_ERROR = 800;
static final int STK_CC_SS_TO_SS_ERROR = 900;
+ static final int STK_CC_SS_TO_DIAL_VIDEO_ERROR = 1000;
private final ArrayList<String> mBusyList = new ArrayList<String>();
@@ -81,7 +82,8 @@
if (id == RESPONSE_ERROR || id == RADIO_OFF_ERROR || id == EXCEPTION_ERROR
|| id == FDN_CHECK_FAILURE || id == STK_CC_SS_TO_DIAL_ERROR
- || id == STK_CC_SS_TO_USSD_ERROR || id == STK_CC_SS_TO_SS_ERROR) {
+ || id == STK_CC_SS_TO_USSD_ERROR || id == STK_CC_SS_TO_SS_ERROR
+ || id == STK_CC_SS_TO_DIAL_VIDEO_ERROR) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
int msgId;
@@ -113,6 +115,10 @@
msgId = R.string.stk_cc_ss_to_ss_error;
builder.setPositiveButton(R.string.close_dialog, mDismiss);
break;
+ case STK_CC_SS_TO_DIAL_VIDEO_ERROR:
+ msgId = R.string.stk_cc_ss_to_dial_video_error;
+ builder.setPositiveButton(R.string.close_dialog, mDismiss);
+ break;
case EXCEPTION_ERROR:
default:
msgId = R.string.exception_error;
@@ -197,6 +203,15 @@
onError(preference, FDN_CHECK_FAILURE);
} else if (exception.getCommandError() == CommandException.Error.RADIO_NOT_AVAILABLE) {
onError(preference, RADIO_OFF_ERROR);
+ } else if (exception.getCommandError() == CommandException.Error.SS_MODIFIED_TO_DIAL) {
+ onError(preference, STK_CC_SS_TO_DIAL_ERROR);
+ } else if (exception.getCommandError() == CommandException.Error
+ .SS_MODIFIED_TO_DIAL_VIDEO) {
+ onError(preference, STK_CC_SS_TO_DIAL_VIDEO_ERROR);
+ } else if (exception.getCommandError() == CommandException.Error.SS_MODIFIED_TO_USSD) {
+ onError(preference, STK_CC_SS_TO_USSD_ERROR);
+ } else if (exception.getCommandError() == CommandException.Error.SS_MODIFIED_TO_SS) {
+ onError(preference, STK_CC_SS_TO_SS_ERROR);
} else {
preference.setEnabled(false);
onError(preference, EXCEPTION_ERROR);
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index a420100..ad7da20 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -124,6 +124,11 @@
case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_USSD:
case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_SS:
case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_DIAL:
+ case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_DIAL_VIDEO:
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_SS:
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_USSD:
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_DIAL:
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO:
case android.telephony.DisconnectCause.ERROR_UNSPECIFIED:
case android.telephony.DisconnectCause.MAXIMUM_NUMBER_OF_CALLS_REACHED:
case android.telephony.DisconnectCause.DATA_DISABLED:
@@ -304,6 +309,26 @@
resourceId = R.string.callFailed_dialToDial;
break;
+ case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_DIAL_VIDEO:
+ resourceId = R.string.callFailed_dialToDialVideo;
+ break;
+
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_SS:
+ resourceId = R.string.callFailed_dialVideoToSs;
+ break;
+
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_USSD:
+ resourceId = R.string.callFailed_dialVideoToUssd;
+ break;
+
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_DIAL:
+ resourceId = R.string.callFailed_dialVideoToDial;
+ break;
+
+ case android.telephony.DisconnectCause.DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO:
+ resourceId = R.string.callFailed_dialVideoToDialVideo;
+ break;
+
case android.telephony.DisconnectCause.OUTGOING_FAILURE:
// We couldn't successfully place the call; there was some
// failure in the telephony layer.