commit 7053941681252181160a2fa8d071f0710587e440
author Brad Ebinger <breadley@google.com> Tue Apr 24 13:04:39 2018 -0700
committer Brad Ebinger <breadley@google.com> Mon Jun 11 11:20:56 2018 -0700
tree ef0258c35034b6d415c9d81f86268240704e8026
parent 951fef3680ca9129608dd5be5e990a3da4b1b3c4

Correctly Destroy a Connection when there is an Error

We were disconnecting but not destroying the Connections
correctly, which led to "stuck" calls in Telecom.

Bug: 77921103
Test: Manual
Merged-In: I935b9edb0c33d21cd691707837e3a911466aab15
Change-Id: I79d31b2de1f88bfbdceef658f6400b3e9401f1d3

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 b3369b5..c7b2096 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1037,6 +1037,8 @@
             }
             connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
                     cause, e.getMessage()));
+            connection.clearOriginalConnection();
+            connection.destroy();
             return;
         }
 
@@ -1059,6 +1061,8 @@
             Log.d(this, "placeOutgoingConnection, phone.dial returned null");
             connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
                     telephonyDisconnectCause, "Connection is null"));
+            connection.clearOriginalConnection();
+            connection.destroy();
         } else {
             connection.setOriginalConnection(originalConnection);
         }