Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'catch-security-exception-for-bluetooth-address-setting' into 'master'

Browse Source 
Catch SecurityException for bluetooth_address setting

See merge request briar/briar!1811
This commit is contained in:
Torsten Grote
2023-09-12 16:24:05 +00:00
parent 09a9a00af6 05b9dd699e
commit cc9ebe9eda
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
View File

@@ -64,10 +64,15 @@ public class AndroidUtils {
} }
// Return the address from settings if it's valid and not fake // Return the address from settings if it's valid and not fake
if (SDK_INT < 33) { if (SDK_INT < 33) {
address = Settings.Secure.getString(ctx.getContentResolver(), try {
"bluetooth_address"); address = Settings.Secure.getString(ctx.getContentResolver(),
if (isValidBluetoothAddress(address)) { "bluetooth_address");
return new Pair<>(address, "settings"); if (isValidBluetoothAddress(address)) {
return new Pair<>(address, "settings");
}
} catch (SecurityException e) {
// Some custom ROMs throw this exception on SDK_INT < 33.
// Fall through
} }
} }
// Try to get the address via reflection // Try to get the address via reflection