diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-22 02:20:05 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-22 02:20:05 +0000 |
commit | 30ca8fa428c2ad1110094958538de57f387e6e75 (patch) | |
tree | 35dcd5b944f1d0e95f81e1503a1e1c08a479e291 | |
parent | 70a60418f6105803b31e8450a5b4b90569b06e4c (diff) | |
parent | 2536d3735135f9ccc8cd460a334f189476b498e0 (diff) | |
download | Telecomm-android14-security-release.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24151559'] into udc-release.android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-release
Change-Id: Ic70fd66334c03f6738d8c5a035a54ea5172692e0
-rw-r--r-- | src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java index 963e92317..05e73d544 100644 --- a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java +++ b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java @@ -175,6 +175,20 @@ public class CallRedirectionProcessor implements CallRedirectionCallback { 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 { |