commit ffdcde015742d068069474c40baf815e04cb4af1
author Xin Li <delphij@google.com> Wed Sep 27 16:05:22 2023 -0700
committer Xin Li <delphij@google.com> Wed Sep 27 16:05:22 2023 -0700
tree 37b3cb6fe680c2952f211b1ef8b442357610e10f
parent 16e65883f0beb5dd0aa081467d474e6ff2dc7677
parent 30ca8fa428c2ad1110094958538de57f387e6e75

Merge UP1A.231005.007

Bug: 291102124
Merged-In: I065d361b83700474a1efab2a75928427ee0a14ba
Change-Id: Id4f6a4f6149e81df76f5fca515823cb552de875d

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 963e923..05e73d5 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 {