mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-05 11:01:17 +00:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
62 lines
2.8 KiB
Diff
62 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tyler Gunn <tgunn@google.com>
|
|
Date: Mon, 7 Mar 2022 09:32:42 -0800
|
|
Subject: [PATCH] Handle null bindings returned from ConnectionService.
|
|
|
|
When a ConnectionService returns a null binding, immediately unbind from
|
|
the ConnectionService and cancel any ongoing calls related to it.
|
|
|
|
Bug: 211114016
|
|
Test: Added new CTS test to verify auto unbind from null binding ConnectionService.
|
|
Test: Manually tested using test app which implements null binding ConnectionService and verified via telecom log inspection that the service is unbound and the call is terminated.
|
|
Change-Id: I0757557e66725dddfd871cd9857071a8749bd7ba
|
|
(cherry picked from commit 410ce026004bb485c39afcc7d86e89d26ff1af94)
|
|
Merged-In: I0757557e66725dddfd871cd9857071a8749bd7ba
|
|
---
|
|
.../android/server/telecom/ServiceBinder.java | 25 ++++++++++++++++++-
|
|
1 file changed, 24 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/com/android/server/telecom/ServiceBinder.java b/src/com/android/server/telecom/ServiceBinder.java
|
|
index f15570b44..7866fa01f 100644
|
|
--- a/src/com/android/server/telecom/ServiceBinder.java
|
|
+++ b/src/com/android/server/telecom/ServiceBinder.java
|
|
@@ -146,7 +146,6 @@ abstract class ServiceBinder {
|
|
Log.i(this, "Service bound %s", componentName);
|
|
|
|
Log.addEvent(mCall, LogUtils.Events.CS_BOUND, componentName);
|
|
- mCall = null;
|
|
|
|
// Unbind request was queued so unbind immediately.
|
|
if (mIsBindingAborted) {
|
|
@@ -188,6 +187,30 @@ abstract class ServiceBinder {
|
|
Log.endSession();
|
|
}
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Handles the case where the {@link ConnectionService} we bound to returned a null binding.
|
|
+ * We want to unbind from the service and cleanup and call resources at this time.
|
|
+ * @param componentName The component of the {@link ConnectionService}.
|
|
+ */
|
|
+ @Override
|
|
+ public void onNullBinding(ComponentName componentName) {
|
|
+ try {
|
|
+ Log.startSession("SBC.oNB");
|
|
+ synchronized (mLock) {
|
|
+ Log.w(this, "Null binding %s", componentName);
|
|
+ Log.addEvent(mCall, "NULL_BINDING", componentName);
|
|
+ String componentStr = componentName == null ? "null" : componentName.toString();
|
|
+ android.util.EventLog.writeEvent(0x534e4554, "211114016", -1, componentStr);
|
|
+ logServiceDisconnected("onNullBinding");
|
|
+ mContext.unbindService(this);
|
|
+ clearAbort();
|
|
+ handleFailedConnection();
|
|
+ }
|
|
+ } finally {
|
|
+ Log.endSession();
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
private void handleDisconnect() {
|