SPenActions: Handle all known S Pen types automatically

Change-Id: I776a7b49bb17dd24f66bcf7983bcaf86dbc4a876

Author: bgcngm

packages/SPenActions/res/values/config.xml

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022-2026 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -22,6 +22,7 @@
 import android.os.UserHandle;
 import android.util.Log;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -62,15 +63,17 @@ public void onScanResult(int callbackType, ScanResult result) {
                 simulateReconnection(context);
             }
         };
-        ScanFilter filter = new ScanFilter.Builder()
-                .setServiceUuid(new ParcelUuid(UUID.fromString(
-                        context.getResources().getString(R.string.config_sPenServiceUuid))))
-                .build();
+        List<ScanFilter> filters = new ArrayList<>();
+        for (UUID uuid : SPenIdentity.getServiceUUIDs()) {
+            filters.add(new ScanFilter.Builder()
+                    .setServiceUuid(new ParcelUuid(uuid))
+                    .build());
+        }
         ScanSettings settings = new ScanSettings.Builder()
                 .setCallbackType(ScanSettings.CALLBACK_TYPE_FIRST_MATCH)
                 .build();
 
-        scanner.startScan(List.of(filter), settings, callback);
+        scanner.startScan(filters, settings, callback);
         new Handler(Looper.getMainLooper()).postDelayed(() -> {
             scanner.stopScan(callback);
         }, 60 * 1000); // Cancel scan after 60s

packages/SPenActions/src/org/lineageos/spenactions/BluetoothUtils.java

@@ -48,7 +48,8 @@ public class SPenGattCallback extends BluetoothGattCallback {
     private final Context mContext;
     private final SPenConnectionManager mConnectionManager;
     private final List<UUID> mEnableCharacteristics = new ArrayList<>();
-    private final UUID mServiceUUID;
+
+    private UUID mServiceUUID;
 
     private boolean mButtonHadGesture = false;
     private long mButtonDownTime = 0;
@@ -59,9 +60,6 @@ public SPenGattCallback(SPenConnectionManager connectionManager, Context context
 
         mEnableCharacteristics.add(BATTERY_LEVEL);
         mEnableCharacteristics.add(BUTTON_EVENT);
-
-        mServiceUUID = UUID.fromString(
-                context.getResources().getString(R.string.config_sPenServiceUuid));
     }
 
     @Override
@@ -85,13 +83,21 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
 
     @Override
     public void onServicesDiscovered(BluetoothGatt gatt, int status) {
-        BluetoothGattService service = gatt.getService(mServiceUUID);
-        if (service != null) {
+        for (BluetoothGattService service : gatt.getServices()) {
+            UUID uuid = service.getUuid();
+            if (SPenIdentity.isSPenService(uuid)) {
+                mServiceUUID = uuid;
+                break;
+            }
+        }
+
+        if (mServiceUUID != null) {
             Log.i(LOG_TAG, "Found S Pen GATT service: " + mServiceUUID);
             if (mEnableCharacteristics.size() > 0) {
                 Log.i(LOG_TAG, "Enabling characteristic notifications");
                 setCharacteristicNotification(gatt,
-                        service.getCharacteristic(mEnableCharacteristics.get(0)), true);
+                        gatt.getService(mServiceUUID)
+                                .getCharacteristic(mEnableCharacteristics.get(0)), true);
             }
         } else {
             Log.e(LOG_TAG, "Unable to find S Pen GATT service!");

packages/SPenActions/src/org/lineageos/spenactions/SPenGattCallback.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2026 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.lineageos.spenactions;
+
+import java.util.Set;
+import java.util.UUID;
+
+public final class SPenIdentity {
+
+    // List of known S Pen GATT services
+    private static final Set<UUID> SERVICE_UUIDS = Set.of(
+            UUID.fromString("0000fd6c-0000-1000-8000-00805f9b34fb"), // EXT1/CANVAS/STICKY
+            UUID.fromString("dc6bb0a8-202e-487c-8f1b-53b37cc837c6"), // DAVINCI
+            UUID.fromString("edfec62e-9910-0bac-5241-d8bda6932a2f"), // GENERIC_BUNDLED/CROWN
+            UUID.fromString("edfec62e-9910-0bac-5241-d8bda6932a30")  // GENERIC_UNBUNDLED
+    );
+
+    private SPenIdentity() {
+    }
+
+    public static boolean isSPenService(UUID uuid) {
+        return SERVICE_UUIDS.contains(uuid);
+    }
+
+    public static Set<UUID> getServiceUUIDs() {
+        return SERVICE_UUIDS;
+    }
+}