commit d5d252e096fa6f901e0b3ea8e6cc4660db98dc77
author Brad Ebinger <breadley@google.com> Mon Jun 11 21:07:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 11 21:07:58 2018 +0000
tree e74d9f415bdef12219de1fe3c75726385e138aa6
parent d089f39f9d1827a0d67ae097832b7d0cfce0246e
parent 7fac25e9644ca4e61f3ccc72f7f1ab08879e0a56

Merge "Change the Theme of the ECBM AlertDialog"

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