commit a55cc01aeb15569e6abdddc97e4378d4f6fbca49
author Grace Jia <xiaotonj@google.com> Fri Aug 04 03:14:47 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 04 03:14:47 2023 +0000
tree 5ca5f94ddeaa4e4cb65ae7c560b7944a10e4066c
parent 09bd04141f8cac26b231a36aba53dd1dfb9048dd
parent 72e92682bf00477b09327e33450b6cfe34ef4b93

Fix vulnerability in CallRedirectionService. am: 29b52e3cd0 am: 1637f8e358 am: 72e92682bf

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

Change-Id: I331520dfd221390088db51b0f597eedf06008f3e
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 4f486b2..471a82a 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 {