diff options
author | Grace Jia <xiaotonj@google.com> | 2023-08-04 03:14:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-04 03:14:47 +0000 |
commit | a55cc01aeb15569e6abdddc97e4378d4f6fbca49 (patch) | |
tree | 5ca5f94ddeaa4e4cb65ae7c560b7944a10e4066c | |
parent | 09bd04141f8cac26b231a36aba53dd1dfb9048dd (diff) | |
parent | 72e92682bf00477b09327e33450b6cfe34ef4b93 (diff) | |
download | Telecomm-a55cc01aeb15569e6abdddc97e4378d4f6fbca49.tar.gz |
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>
-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 4f486b2cd..471a82ab7 100644 --- a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java +++ b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java @@ -164,6 +164,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 { |