commit 1637f8e358a7f7e2d215ff0eeb63d7b06668f71b
author Grace Jia <xiaotonj@google.com> Fri Aug 04 01:48:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 04 01:48:06 2023 +0000
tree 2154fac8b5687cfbc916a466a2a0792cf0c01b80
parent 2a10deb1a079b7d89ac34f83b8035819ccd2c1f6
parent 29b52e3cd027da2d8644450a4dee3a7d95dc0043

Fix vulnerability in CallRedirectionService. am: 29b52e3cd0

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

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

src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java

diff --git a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java
index da64b37..879b266 100644
--- a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java
+++ b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java
@@ -164,6 +164,20 @@
                     Log.endSession();
                 }
             }
+
+            @Override
+            public void onBindingDied(ComponentName componentName) {
+                // Make sure we unbind the service if binding died to avoid background stating
+                // activity leaks
+                Log.startSession("CRSC.oBD");
+                try {
+                    synchronized (mTelecomLock) {
+                        finishCallRedirection();
+                    }
+                } finally {
+                    Log.endSession();
+                }
+            }
         }
 
         private class CallRedirectionAdapter extends ICallRedirectionAdapter.Stub {