From 05b9dd699e9a2bc2935ee95519b2ff8ee29594d1 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 12 Sep 2023 17:12:13 +0100
Subject: [PATCH] Catch SecurityException for bluetooth_address setting.

---
 .../org/briarproject/bramble/util/AndroidUtils.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
index e18e4c6ea..f3431fe38 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
@@ -64,10 +64,15 @@ public class AndroidUtils {
 		}
 		// Return the address from settings if it's valid and not fake
 		if (SDK_INT < 33) {
-			address = Settings.Secure.getString(ctx.getContentResolver(),
-					"bluetooth_address");
-			if (isValidBluetoothAddress(address)) {
-				return new Pair<>(address, "settings");
+			try {
+				address = Settings.Secure.getString(ctx.getContentResolver(),
+						"bluetooth_address");
+				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