Skip to content

Commit 196697f

Browse files
committed
Changing Manifest, attempt to make BT connectivity work
1 parent 584ffc3 commit 196697f

File tree

3 files changed

+42
-4
lines changed

3 files changed

+42
-4
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ android {
7979

8080
applicationId "com.maxieds.chameleonminilivedebugger"
8181
minSdkVersion 29
82-
targetSdkVersion 29
82+
targetSdkVersion 30
8383
compileSdkVersion 29
84-
versionCode 100 + 8080
85-
versionName "1.3.8"
84+
versionCode 101 + 8080
85+
versionName "1.3.9"
8686
multiDexEnabled true
8787

8888
buildConfigField "String", "GIT_COMMIT_HASH", "\"" + getGitCommitHash() + "\""

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<uses-permission android:name="android.permission.USB_PERMISSION" android:required="true" />
3030
<uses-permission android:name="android.permission.BLUETOOTH" android:required="false" />
3131
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:required="false" />
32+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" android:required="false" />
33+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:required="false" />
3234
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:required="false" />
3335
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:required="false" />
3436
<uses-permission android:name="android.permission.VIBRATE" android:required="true" />
@@ -81,7 +83,7 @@
8183
<action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
8284
<category android:name="android.intent.category.HOME" />
8385
<category android:name="android.intent.category.DEFAULT" />
84-
<category android:name="android.intent.category.LAUNCHER" />
86+
<!--<category android:name="android.intent.category.LAUNCHER" />-->
8587
</intent-filter>
8688
<meta-data
8789
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
@@ -103,9 +105,14 @@
103105
/>
104106

105107
<intent-filter>
108+
<action android:name="android.intent.action.MAIN" />
106109
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
107110
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
108111
</intent-filter>
112+
<meta-data
113+
android:name="android.hardware.usb.action.ACL_CONNECTED"
114+
android:resource="@xml/chameleon_bluetooth_device_filter"
115+
/>
109116

110117
<intent-filter>
111118
<action android:name="android.intent.action.MAIN" />
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
This program (The Chameleon Mini Live Debugger) is free software written by
5+
Maxie Dion Schmidt: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation, either version 3 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
The complete license provided with source distributions of this library is
16+
available at the following link:
17+
https://github.com/maxieds/ChameleonMiniLiveDebugger
18+
-->
19+
20+
<resources>
21+
22+
<bluetooth-device uuid="51510001-7969-6473-6f40-6b6f6c6c6957" name="BLE-Chameleon" />
23+
<bluetooth-device uuid="51510002-7969-6473-6f40-6b6f6c6c6957" name="BLE-Chameleon" />
24+
<bluetooth-device uuid="51510003-7969-6473-6f40-6b6f6c6c6957" name="BLE-Chameleon" />
25+
<bluetooth-device uuid="51510001-7969-6473-6f40-6b6f6c6c6957" name="ChameleonTiny" />
26+
<bluetooth-device uuid="51510002-7969-6473-6f40-6b6f6c6c6957" name="ChameleonTiny" />
27+
<bluetooth-device uuid="51510003-7969-6473-6f40-6b6f6c6c6957" name="ChameleonTiny" />
28+
<bluetooth-device uuid="52520003-7969-6473-6f40-6b6f6c6c6957" name="Chameleon" />
29+
<bluetooth-device uuid="00002902-0000-1000-8000-00805f9b34fb" name="Chameleon" />
30+
31+
</resources>

0 commit comments

Comments
 (0)