commit 0536d11757f3c824cc0efb3f822a6e0c3b9daeec
author Pavel Zhamaitsiak <pavelz@google.com> Mon Mar 30 16:21:33 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 30 16:21:33 2015 +0000
tree 75de339faeb921e78d6dbd15cccc22c1dd2ec7a4
parent a623a51c61536eed1b510c2c72f3756f1d47c622
parent 87050c69ed4c62d5fddc494eb1a9b85a23d78214

Handle new error code in CallStateException
automerge: 87050c6

* commit '87050c69ed4c62d5fddc494eb1a9b85a23d78214':
  Handle new error code in CallStateException

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index c4eb2e9..39dbfc1 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -336,9 +336,12 @@
             originalConnection = phone.dial(number, request.getVideoState());
         } catch (CallStateException e) {
             Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);
+            int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
+            if (e.getError() == CallStateException.ERROR_DISCONNECTED) {
+                cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
+            }
             connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
-                    android.telephony.DisconnectCause.OUTGOING_FAILURE,
-                    e.getMessage()));
+                    cause, e.getMessage()));
             return;
         }