mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-04 02:21:22 +00:00
a53062ca0b
Adds ptrace_scope and timeout options to 17.1, tested working
Also adds hardened_malloc to 15.1, but failing to compile:
external/hardened_malloc/h_malloc.c:1688:18: error: use of undeclared identifier 'M_PURGE'
if (param == M_PURGE) {
^
external/hardened_malloc/h_malloc.c:1743:30: error: missing field 'ordblks' initializer [-Werror,-Wmissing-field-initializers]
struct mallinfo info = {0};
^
Signed-off-by: Tad <tad@spotco.us>
122 lines
5.3 KiB
Diff
122 lines
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: pratyush <codelab@pratyush.dev>
|
|
Date: Thu, 1 Jul 2021 12:26:49 +0530
|
|
Subject: [PATCH] Bluetooth auto turn off
|
|
|
|
---
|
|
core/java/android/provider/Settings.java | 6 ++
|
|
.../server/BluetoothManagerService.java | 76 +++++++++++++++++++
|
|
2 files changed, 82 insertions(+)
|
|
|
|
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
|
|
index 89d736730a3e..a91f3db2c133 100644
|
|
--- a/core/java/android/provider/Settings.java
|
|
+++ b/core/java/android/provider/Settings.java
|
|
@@ -15121,6 +15121,12 @@ public final class Settings {
|
|
public static final String POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE =
|
|
"power_button_suppression_delay_after_gesture_wake";
|
|
|
|
+ /**
|
|
+ * The amount of time in milliseconds before bluetooth is turned off
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String BLUETOOTH_OFF_TIMEOUT = "bluetooth_off_timeout";
|
|
+
|
|
/**
|
|
* Whether to automatically reboot the device after a user defined timeout
|
|
*
|
|
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
|
|
index 9bcded3e1e14..512cecab807a 100644
|
|
--- a/services/core/java/com/android/server/BluetoothManagerService.java
|
|
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
|
|
@@ -18,6 +18,7 @@ package com.android.server;
|
|
|
|
import android.Manifest;
|
|
import android.app.ActivityManager;
|
|
+import android.app.AlarmManager;
|
|
import android.app.AppGlobals;
|
|
import android.app.AppOpsManager;
|
|
import android.bluetooth.BluetoothAdapter;
|
|
@@ -494,6 +495,81 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
|
|
Slog.w(TAG, "Unable to resolve SystemUI's UID.", e);
|
|
}
|
|
mSystemUiUid = systemUiUid;
|
|
+
|
|
+ /*
|
|
+ * System sends ACTION_STATE_CHANGED broadcast soon as any state
|
|
+ * changes. what it means in action is we don't have to take care if
|
|
+ * device reboot while BT has not been turned off automatically.
|
|
+ *
|
|
+ * A word of warning though it does not check if device as been
|
|
+ * unlocked or not what it means in real life is if you have sometime
|
|
+ * like tile ble tracker configured it will turn off BT. As result tile
|
|
+ * tracking will fail because of auto timeout. this behaviour can be
|
|
+ * changed with UserManager.isUnlocked()
|
|
+ * */
|
|
+ IntentFilter btFilter = new IntentFilter();
|
|
+ btFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
|
|
+ btFilter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
|
|
+ btFilter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
|
|
+ context.registerReceiver(new BroadcastReceiver() {
|
|
+ @Override
|
|
+ public void onReceive(Context broadcastContext, Intent intent) {
|
|
+ reconfigureBtTimeoutListener();
|
|
+ }
|
|
+ }, btFilter);
|
|
+
|
|
+ context.getContentResolver().registerContentObserver(
|
|
+ Settings.Global.getUriFor(Settings.Global.BLUETOOTH_OFF_TIMEOUT),
|
|
+ false,
|
|
+ new ContentObserver(new Handler(context.getMainLooper())) {
|
|
+ @Override
|
|
+ public void onChange(boolean selfChange) {
|
|
+ super.onChange(selfChange);
|
|
+ reconfigureBtTimeoutListener();
|
|
+ }
|
|
+ });
|
|
+ }
|
|
+
|
|
+ private static final AlarmManager.OnAlarmListener listener = () -> {
|
|
+ BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
|
+ if (isBtOnAndDisconnected() && bluetoothAdapter != null) {
|
|
+ bluetoothAdapter.disable();
|
|
+ }
|
|
+ };
|
|
+
|
|
+ // If device is still connected cancel timeout for now and wait for disconnected signal
|
|
+ private void reconfigureBtTimeoutListener() {
|
|
+ AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
|
|
+ if (isTimeoutEnabled(mContext) && isBtOnAndDisconnected()) {
|
|
+ final long timeout = SystemClock.elapsedRealtime() + btTimeoutDurationInMilli(mContext);
|
|
+ alarmManager.cancel(listener);
|
|
+ alarmManager.setExact(
|
|
+ AlarmManager.ELAPSED_REALTIME_WAKEUP,
|
|
+ timeout,
|
|
+ "BT Idle Timeout",
|
|
+ listener,
|
|
+ new Handler(mContext.getMainLooper())
|
|
+ );
|
|
+ } else {
|
|
+ alarmManager.cancel(listener);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private static boolean isBtOnAndDisconnected() {
|
|
+ BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
|
+ return bluetoothAdapter != null && bluetoothAdapter.getState() == BluetoothAdapter.STATE_ON
|
|
+ && bluetoothAdapter.getState() == BluetoothAdapter.STATE_ON &&
|
|
+ bluetoothAdapter.getConnectionState() == BluetoothAdapter.STATE_DISCONNECTED;
|
|
+ }
|
|
+
|
|
+ private static long btTimeoutDurationInMilli(Context context) {
|
|
+ return Settings.Global.getLong(context.getContentResolver(),
|
|
+ Settings.Global.BLUETOOTH_OFF_TIMEOUT, 0);
|
|
+ }
|
|
+
|
|
+ /** Zero is default and means disabled */
|
|
+ private static boolean isTimeoutEnabled(Context context) {
|
|
+ return 0 != btTimeoutDurationInMilli(context);
|
|
}
|
|
|
|
/**
|