summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrace Jia <xiaotonj@google.com>2023-08-04 07:00:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-08-04 07:00:46 +0000
commitfb48ddcc36772876a5a2824a81a83ed7fd19d481 (patch)
tree09c17ddbc77760a7a6de2b67fa566d2a7f042312
parenteda706fc852d74b308fcc817839c12f0ba4f698b (diff)
parent72265bc04da98459f5c81ef688d43cd001269718 (diff)
downloadTelecomm-fb48ddcc36772876a5a2824a81a83ed7fd19d481.tar.gz
Fix vulnerability in CallRedirectionService. am: 29b52e3cd0 am: 1637f8e358 am: 72e92682bf am: a55cc01aeb am: d24ae916ef am: 39828d2e84 am: 8a92a8f0de am: 72265bc04d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/24151559 Change-Id: I49b1d1662305152ee42017933415b2e6b075dd23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java14
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 {