commit 7a6974395197433182d085be1d1047f2aedc22bb
author Pranav Madapurmath <pmadapurmath@google.com> Fri Jun 21 19:18:44 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 21 19:18:44 2024 +0000
tree b373261d0f2ca3d8ae4099afb8acdbadbcdbfbab
parent d57f25311acb7fb887fb0296364526345cc905bb
parent a8e2bf9c77cd94f683979c849015b78ef0537802

Merge "Resolve cross-user image exploit for conference status hints" into sc-dev

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 338aa19..efd3880 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();
                     }