Merge "Remove isCspPlmnEnabled from GsmOptions"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f61e69e..9e55501 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1802,4 +1802,17 @@
<!-- Message displayed to the user to indicate that a held call has been released /
disconnected. -->
<string name="supp_service_held_call_released">Held call has been released.</string>
+
+ <!-- In-call screen: error message shown when the user has attempted to place a new outgoing
+ call, but there is already a call in dialing state. -->
+ <string name="callFailed_already_dialing">Cannot place a call as another outgoing call is already dialing.</string>
+ <!-- In-call screen: error message shown when the user has attempted to place a new outgoing
+ call while there is already a call in ringing state. -->
+ <string name="callFailed_already_ringing">Cannot place a call as there is an unanswered incoming call. Answer or reject the incoming call prior to placing a new call.</string>
+ <!-- In-call screen: error message shown when the user attempts to place a call, but calling has
+ been disabled using a debug property. -->
+ <string name="callFailed_calling_disabled">Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property.</string>
+ <!-- In-call screen: error message shown when the user attempts to place a call, but calling has
+ been disabled using a debug property. -->
+ <string name="callFailed_too_many_calls">Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call.</string>
</resources>
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 62aa3a1..611d147 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -169,6 +169,10 @@
case android.telephony.DisconnectCause.SERVER_ERROR:
case android.telephony.DisconnectCause.SERVER_UNREACHABLE:
case android.telephony.DisconnectCause.TIMED_OUT:
+ case android.telephony.DisconnectCause.ALREADY_DIALING:
+ case android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING:
+ case android.telephony.DisconnectCause.CALLING_DISABLED:
+ case android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS:
case android.telephony.DisconnectCause.UNOBTAINABLE_NUMBER:
case android.telephony.DisconnectCause.VOICEMAIL_NUMBER_MISSING:
case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_USSD:
@@ -321,6 +325,18 @@
case android.telephony.DisconnectCause.DATA_LIMIT_REACHED:
resourceId = R.string.callFailed_data_limit_reached;
break;
+ case android.telephony.DisconnectCause.ALREADY_DIALING:
+ resourceId = R.string.callFailed_already_dialing;
+ break;
+ case android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING:
+ resourceId = R.string.callFailed_already_ringing;
+ break;
+ case android.telephony.DisconnectCause.CALLING_DISABLED:
+ resourceId = R.string.callFailed_calling_disabled;
+ break;
+ case android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS:
+ resourceId = R.string.callFailed_too_many_calls;
+ break;
case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL:
resourceId = R.string.incall_error_power_off;
@@ -689,6 +705,18 @@
case android.telephony.DisconnectCause.WIFI_LOST:
resourceId = R.string.callFailed_wifi_lost;
break;
+ case android.telephony.DisconnectCause.ALREADY_DIALING:
+ resourceId = R.string.callFailed_already_dialing;
+ break;
+ case android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING:
+ resourceId = R.string.callFailed_already_ringing;
+ break;
+ case android.telephony.DisconnectCause.CALLING_DISABLED:
+ resourceId = R.string.callFailed_calling_disabled;
+ break;
+ case android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS:
+ resourceId = R.string.callFailed_too_many_calls;
+ break;
case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL:
resourceId = R.string.incall_error_power_off;
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 3ec00b9..16be893 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1120,10 +1120,25 @@
} catch (CallStateException e) {
Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);
int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
- if (e.getError() == CallStateException.ERROR_OUT_OF_SERVICE) {
- cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
- } else if (e.getError() == CallStateException.ERROR_POWER_OFF) {
- cause = android.telephony.DisconnectCause.POWER_OFF;
+ switch (e.getError()) {
+ case CallStateException.ERROR_OUT_OF_SERVICE:
+ cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
+ break;
+ case CallStateException.ERROR_POWER_OFF:
+ cause = android.telephony.DisconnectCause.POWER_OFF;
+ break;
+ case CallStateException.ERROR_ALREADY_DIALING:
+ cause = android.telephony.DisconnectCause.ALREADY_DIALING;
+ break;
+ case CallStateException.ERROR_CALL_RINGING:
+ cause = android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING;
+ break;
+ case CallStateException.ERROR_CALLING_DISABLED:
+ cause = android.telephony.DisconnectCause.CALLING_DISABLED;
+ break;
+ case CallStateException.ERROR_TOO_MANY_CALLS:
+ cause = android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS;
+ break;
}
connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
cause, e.getMessage(), phone.getPhoneId()));