Merge pull request #545 from NordicSemiconductor/bugfix/privilaged

Catching SecurityException from setCharacteristicNotification(...)
NordicSemiconductor · Feb 16, 2024 · eb3ae99 · eb3ae99
2 parents f924120 + e8adafb
commit eb3ae99
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/ble/src/main/java/no/nordicsemi/android/ble/BleManagerHandler.java b/ble/src/main/java/no/nordicsemi/android/ble/BleManagerHandler.java
@@ -935,7 +935,12 @@ private boolean internalEnableNotifications(@Nullable final BluetoothGattCharact
 		final BluetoothGattDescriptor descriptor = getCccd(characteristic, BluetoothGattCharacteristic.PROPERTY_NOTIFY);
 		if (descriptor != null) {
 			log(Log.DEBUG, () -> "gatt.setCharacteristicNotification(" + characteristic.getUuid() + ", true)");
-			gatt.setCharacteristicNotification(characteristic, true);
+			try {
+				gatt.setCharacteristicNotification(characteristic, true);
+			} catch (final SecurityException e) {
+				log(Log.ERROR, e::getLocalizedMessage);
+				return false;
+			}
 
 			log(Log.VERBOSE, () -> "Enabling notifications for " + characteristic.getUuid());
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -965,7 +970,12 @@ private boolean internalDisableNotifications(@Nullable final BluetoothGattCharac
 				BluetoothGattCharacteristic.PROPERTY_NOTIFY | BluetoothGattCharacteristic.PROPERTY_INDICATE);
 		if (descriptor != null) {
 			log(Log.DEBUG, () -> "gatt.setCharacteristicNotification(" + characteristic.getUuid() + ", false)");
-			gatt.setCharacteristicNotification(characteristic, false);
+			try {
+				gatt.setCharacteristicNotification(characteristic, false);
+			} catch (final SecurityException e) {
+				log(Log.ERROR, e::getLocalizedMessage);
+				return false;
+			}
 
 			log(Log.VERBOSE, () -> "Disabling notifications and indications for " + characteristic.getUuid());
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -994,7 +1004,12 @@ private boolean internalEnableIndications(@Nullable final BluetoothGattCharacter
 		final BluetoothGattDescriptor descriptor = getCccd(characteristic, BluetoothGattCharacteristic.PROPERTY_INDICATE);
 		if (descriptor != null) {
 			log(Log.DEBUG, () -> "gatt.setCharacteristicNotification(" + characteristic.getUuid() + ", true)");
-			gatt.setCharacteristicNotification(characteristic, true);
+			try {
+				gatt.setCharacteristicNotification(characteristic, true);
+			} catch (final SecurityException e) {
+				log(Log.ERROR, e::getLocalizedMessage);
+				return false;
+			}
 
 			log(Log.VERBOSE, () -> "Enabling indications for " + characteristic.getUuid());
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {