commit 3799257f8928b41d3d1b911d213fa4b4eb4f31d2
author Chao Liu <yjl@google.com> Fri Jun 19 18:32:58 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 18:32:59 2015 +0000
tree 8a156b0ac168d0906b5d35597b8be68e75519089
parent 14c8c213438736b4955fc74f9f5646c4ad4c38a0
parent af2b70218787ec23cf547888eae401d094c5633b

Merge "Always provide the string reason to telecom DisconnectCause." into mnc-dev

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

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index a52418c..8c09a95 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -724,7 +724,8 @@
                     break;
                 case DISCONNECTED:
                     setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
-                            mOriginalConnection.getDisconnectCause()));
+                            mOriginalConnection.getDisconnectCause(),
+                            mOriginalConnection.getVendorDisconnectCause()));
                     close();
                     break;
                 case DISCONNECTING:

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 d1f3dc2..f8a3b84 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -294,7 +294,8 @@
         if (phone == null) {
             return Connection.createFailedConnection(
                     DisconnectCauseUtil.toTelecomDisconnectCause(
-                            android.telephony.DisconnectCause.ERROR_UNSPECIFIED));
+                            android.telephony.DisconnectCause.ERROR_UNSPECIFIED,
+                            "Phone is null"));
         }
 
         Call call = phone.getRingingCall();
@@ -333,7 +334,8 @@
         if (phone == null) {
             return Connection.createFailedConnection(
                     DisconnectCauseUtil.toTelecomDisconnectCause(
-                            android.telephony.DisconnectCause.ERROR_UNSPECIFIED));
+                            android.telephony.DisconnectCause.ERROR_UNSPECIFIED,
+                            "Phone is null"));
         }
 
         final List<com.android.internal.telephony.Connection> allConnections = new ArrayList<>();