Changing Manifest, attempt to make BT connectivity work

maxieds · Mar 28, 2022 · 196697f · 196697f
1 parent 584ffc3
commit 196697f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -79,10 +79,10 @@ android {
 
         applicationId "com.maxieds.chameleonminilivedebugger"
         minSdkVersion 29
-        targetSdkVersion 29
+        targetSdkVersion 30
         compileSdkVersion 29
-        versionCode 100 + 8080
-        versionName "1.3.8"
+        versionCode 101 + 8080
+        versionName "1.3.9"
         multiDexEnabled true
 
         buildConfigField "String", "GIT_COMMIT_HASH", "\"" + getGitCommitHash() + "\""

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,8 @@
     <uses-permission android:name="android.permission.USB_PERMISSION" android:required="true" />
     <uses-permission android:name="android.permission.BLUETOOTH" android:required="false" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:required="false" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" android:required="false" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:required="false" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:required="false" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:required="false" />
     <uses-permission android:name="android.permission.VIBRATE" android:required="true" />
@@ -81,7 +83,7 @@
                 <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
             <meta-data
                 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
@@ -103,9 +105,14 @@
                 />
 
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
                 <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
             </intent-filter>
+            <meta-data
+                android:name="android.hardware.usb.action.ACL_CONNECTED"
+                android:resource="@xml/chameleon_bluetooth_device_filter"
+                />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/res/xml/chameleon_bluetooth_device_filter.xml b/app/src/main/res/xml/chameleon_bluetooth_device_filter.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This program (The Chameleon Mini Live Debugger) is free software written by
+Maxie Dion Schmidt: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+The complete license provided with source distributions of this library is
+available at the following link:
+https://github.com/maxieds/ChameleonMiniLiveDebugger
+-->
+
+<resources>
+
+    <bluetooth-device uuid="51510001-7969-6473-6f40-6b6f6c6c6957" name="BLE-Chameleon" />
+    <bluetooth-device uuid="51510002-7969-6473-6f40-6b6f6c6c6957" name="BLE-Chameleon" />
+    <bluetooth-device uuid="51510003-7969-6473-6f40-6b6f6c6c6957" name="BLE-Chameleon" />
+    <bluetooth-device uuid="51510001-7969-6473-6f40-6b6f6c6c6957" name="ChameleonTiny" />
+    <bluetooth-device uuid="51510002-7969-6473-6f40-6b6f6c6c6957" name="ChameleonTiny" />
+    <bluetooth-device uuid="51510003-7969-6473-6f40-6b6f6c6c6957" name="ChameleonTiny" />
+    <bluetooth-device uuid="52520003-7969-6473-6f40-6b6f6c6c6957" name="Chameleon" />
+    <bluetooth-device uuid="00002902-0000-1000-8000-00805f9b34fb" name="Chameleon" />
+
+</resources>