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;
         }
 
