commit 8a92a8f0deaa7ba7f87533dca6e561c601cfe1bf
author Grace Jia <xiaotonj@google.com> Fri Aug 04 05:29:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 04 05:29:09 2023 +0000
tree 0a19cc23adc1975dabbd9f897ea18d41c3ee33d5
parent 3a78ed748b337064a6b7cda75a889b5db2368a55
parent 39828d2e841a013d22fc9bda053c85f8ee51da40

Fix vulnerability in CallRedirectionService. am: 29b52e3cd0 am: 1637f8e358 am: 72e92682bf am: a55cc01aeb am: d24ae916ef am: 39828d2e84

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

Change-Id: Ia7faecdd2956700b8f9e2663d6757ee0b18356ff
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 226382b..02debcd 100644
--- a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java
+++ b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java
@@ -175,6 +175,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 {