commit f6c3269abc589282c6a9296dad35548f3192270a
author Pranav Madapurmath <pmadapurmath@google.com> Fri Jun 21 20:35:51 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 21 20:35:51 2024 +0000
tree 917c831138d08dbd6e7a508de3d5ff8750ea1d31
parent 644f72cf38c688898546e7c9040d7b5c6c82bd61
parent 84c5028eabab06e2ceff0110a91dfde17cbd8fa6

Unbind CallScreeningService when timeout reached. am: d57f25311a am: aaba434a42 am: 274f26bf93 am: 84c5028eab

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/27790553

Change-Id: If76f9b72f65e7a22e5c7ba13b8744bf9b431f59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/server/telecom/CallScreeningServiceHelper.java

diff --git a/src/com/android/server/telecom/CallScreeningServiceHelper.java b/src/com/android/server/telecom/CallScreeningServiceHelper.java
index 5c9ca84..747408c 100644
--- a/src/com/android/server/telecom/CallScreeningServiceHelper.java
+++ b/src/com/android/server/telecom/CallScreeningServiceHelper.java
@@ -176,6 +176,10 @@
                             Log.w(TAG, "Cancelling call id process due to timeout");
                         }
                         mFuture.complete(null);
+                        mContext.unbindService(serviceConnection);
+                    } catch (IllegalArgumentException e) {
+                        Log.i(this, "Exception when unbinding service %s : %s", serviceConnection,
+                                e.getMessage());
                     } finally {
                         Log.endSession();
                     }