mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-29 16:12:38 +00:00
5b114cacf8
It compiles, but fails to sign: > TypeError: cannot use a string pattern on a bytes-like object Signed-off-by: Tad <tad@spotco.us>
63 lines
2.9 KiB
Diff
63 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
|
|
Date: Tue, 6 Sep 2022 16:48:26 +0300
|
|
Subject: [PATCH] bugfix: Bluetooth auto turn off ignored connected BLE devices
|
|
|
|
Previous attempt at fixing this didn't work properly, because getConnectionStateLeAware() didn't
|
|
actually report BLE state.
|
|
---
|
|
.../android/server/ext/BluetoothAutoOff.java | 20 ++++++++++++++-----
|
|
1 file changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/ext/BluetoothAutoOff.java b/services/core/java/com/android/server/ext/BluetoothAutoOff.java
|
|
index 4e7dbc042f37..a091b006214f 100644
|
|
--- a/services/core/java/com/android/server/ext/BluetoothAutoOff.java
|
|
+++ b/services/core/java/com/android/server/ext/BluetoothAutoOff.java
|
|
@@ -3,6 +3,7 @@ package com.android.server.ext;
|
|
import android.annotation.Nullable;
|
|
import android.bluetooth.BluetoothAdapter;
|
|
import android.bluetooth.BluetoothManager;
|
|
+import android.bluetooth.BluetoothProfile;
|
|
import android.content.BroadcastReceiver;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
@@ -12,12 +13,14 @@ import android.provider.Settings;
|
|
import android.util.Slog;
|
|
|
|
class BluetoothAutoOff extends DelayedConditionalAction {
|
|
+ private final BluetoothManager manager;
|
|
@Nullable
|
|
private final BluetoothAdapter adapter;
|
|
|
|
BluetoothAutoOff(SystemServerExt sse) {
|
|
super(sse, sse.bgHandler);
|
|
- adapter = sse.context.getSystemService(BluetoothManager.class).getAdapter();
|
|
+ manager = sse.context.getSystemService(BluetoothManager.class);
|
|
+ adapter = manager.getAdapter();
|
|
}
|
|
|
|
@Override
|
|
@@ -51,11 +54,18 @@ class BluetoothAutoOff extends DelayedConditionalAction {
|
|
|
|
private boolean isAdapterOnAndDisconnected() {
|
|
if (adapter != null) {
|
|
- int state = adapter.getLeStateSysApi(); // getState() converts BLE states into STATE_OFF
|
|
+ if (adapter.isLeEnabled()) {
|
|
+ if (adapter.getConnectionState() == BluetoothAdapter.STATE_DISCONNECTED) {
|
|
+ // Bluetooth GATT Profile (Bluetooth LE) connection state is ignored
|
|
+ // by getConnectionState()
|
|
+ return manager.getConnectedDevices(BluetoothProfile.GATT).size() == 0;
|
|
+ }
|
|
+ }
|
|
|
|
- if (state == BluetoothAdapter.STATE_ON || state == BluetoothAdapter.STATE_BLE_ON) {
|
|
- // getConnectionState() converts BLE states into STATE_DISCONNECTED
|
|
- return adapter.getConnectionStateLeAware() == BluetoothAdapter.STATE_DISCONNECTED;
|
|
+ // isLeEnabled() currently implies isEnabled(), but check again anyway in case
|
|
+ // this changes in the future
|
|
+ if (adapter.isEnabled()) {
|
|
+ return adapter.getConnectionState() == BluetoothAdapter.STATE_DISCONNECTED;
|
|
}
|
|
}
|
|
|