Skip to content

Commit 6a84054

Browse files
Merge pull request #48 from tw-mosip/issue_523_permission_android12_INJI-39-release
fix(INJI-39): add new Bluetooth permission for Android12 [ hotfix ]
2 parents c3ca520 + 05c2e04 commit 6a84054

4 files changed

Lines changed: 14 additions & 3 deletions

File tree

android/app/src/debug/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
xmlns:tools="http://schemas.android.com/tools">
33

44
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
5-
5+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN"
6+
android:usesPermissionFlags="neverForLocation" />
7+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
8+
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
69
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
710
</manifest>

android/app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
66
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
77
<uses-permission android:name="android.permission.BLUETOOTH" />
8+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN"
9+
android:usesPermissionFlags="neverForLocation" />
10+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
11+
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
812
<uses-permission android:name="android.permission.CAMERA" />
913
<uses-permission android:name="android.permission.NFC" />
1014
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
@@ -45,4 +49,4 @@
4549
</activity>
4650
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
4751
</application>
48-
</manifest>
52+
</manifest>

android/app/src/main/java/io/mosip/residentapp/MainActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ public class MainActivity extends ReactActivity {
3232
Manifest.permission.CHANGE_WIFI_MULTICAST_STATE,
3333
Manifest.permission.ACCESS_COARSE_LOCATION,
3434
Manifest.permission.ACCESS_FINE_LOCATION,
35+
// required for Android 12 and above
36+
Manifest.permission.BLUETOOTH_SCAN,
37+
Manifest.permission.BLUETOOTH_CONNECT,
38+
Manifest.permission.BLUETOOTH_ADVERTISE
3539
};
3640

3741
private static final int REQUEST_CODE_REQUIRED_PERMISSIONS = 1;

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
ext {
55
buildToolsVersion = "29.0.3"
66
minSdkVersion = 23
7-
compileSdkVersion = 30
7+
compileSdkVersion = 31
88
targetSdkVersion = 30
99
}
1010
repositories {

0 commit comments

Comments
 (0)