fixup! Bluetooth auto turn off

Adjust to DelayedConditionalAction changes.
GrapheneOS-Archive · Apr 2, 2024 · f21b443 · f21b443
1 parent 364b11f
commit f21b443
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/services/core/java/com/android/server/ext/BluetoothAutoOff.java b/services/core/java/com/android/server/ext/BluetoothAutoOff.java
@@ -9,6 +9,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.ext.settings.ExtSettings;
 import android.util.Slog;
 
@@ -21,12 +22,18 @@ class BluetoothAutoOff extends DelayedConditionalAction {
     @Nullable
     private final BluetoothAdapter adapter;
 
-    BluetoothAutoOff(SystemServerExt sse) {
+    private BluetoothAutoOff(SystemServerExt sse) {
         super(sse, ExtSettings.BLUETOOTH_AUTO_OFF, sse.bgHandler);
         manager = sse.context.getSystemService(BluetoothManager.class);
         adapter = manager.getAdapter();
     }
 
+    static void maybeInit(SystemServerExt sse) {
+        if (sse.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH, 0)) {
+            new BluetoothAutoOff(sse).init();
+        }
+    }
+
     @Override
     protected boolean shouldScheduleAlarm() {
         return isAdapterOnAndDisconnected();

diff --git a/services/core/java/com/android/server/ext/SystemServerExt.java b/services/core/java/com/android/server/ext/SystemServerExt.java
@@ -36,9 +36,6 @@ public static void init(Context systemContext, PackageManagerService pm) {
 
     void initBgThread() {
         WifiAutoOff.maybeInit(this);
-
-        if (packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH, 0)) {
-            new BluetoothAutoOff(this);
-        }
+        BluetoothAutoOff.maybeInit(this);
     }
 }