commit f8a180fa7ec5d510df4d12bd9c864f3296094058
author Brad Ebinger <breadley@google.com> Wed Nov 13 15:09:59 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 13 15:09:59 2019 -0800
tree 7829f9836786deb4e185a0e7d0728b8355d0ab44
parent 78bc7fd5ae2d9907ac726a92d743235514e4f1a7
parent c9831e87be73cec5e5e880707d9b33d6521e220c

Merge "Handle the case when Telecom rejects an incoming call" am: 63632b5bd2 am: 1ded86c4b0
am: c9831e87be

Change-Id: Id60375c6e5946122dce279d2d4b2c3a0c15469cd

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 2d96c6b..8de8c03 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -938,6 +938,23 @@
     }
 
     @Override
+    public void onCreateIncomingConnectionFailed(PhoneAccountHandle connectionManagerPhoneAccount,
+            ConnectionRequest request) {
+        Phone phone = getPhoneForAccount(request.getAccountHandle(), false, null);
+        Call ringingCall = phone.getRingingCall();
+        if (ringingCall.isRinging()) {
+            try {
+                Log.i(this, "onCreateIncomingConnectionFailed: hanging up ringing call "
+                        + ringingCall);
+                ringingCall.hangup();
+            } catch (CallStateException e) {
+                Log.w(this, "onCreateIncomingConnectionFailed: couldn't hang up ringing call "
+                        + ringingCall);
+            }
+        }
+    }
+
+    @Override
     public void triggerConferenceRecalculate() {
         if (mTelephonyConferenceController.shouldRecalculate()) {
             mTelephonyConferenceController.recalculate();