From 46d178138c396d15513d4faaa1599366537bf8f0 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <aleksander.nowakowski@nordicsemi.no>
Date: Thu, 29 Sep 2022 16:45:39 +0200
Subject: [PATCH] Reading PHY if no callback for setting preferred one

---
 .../android/ble/BleManagerHandler.java        | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 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
index 3594f149..7cecdf61 100644
--- a/ble/src/main/java/no/nordicsemi/android/ble/BleManagerHandler.java
+++ b/ble/src/main/java/no/nordicsemi/android/ble/BleManagerHandler.java
@@ -3501,8 +3501,24 @@ private synchronized void nextRequest(final boolean force) {
 				//noinspection ConstantConditions
 				final PhyRequest pr = (PhyRequest) request;
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					result = internalSetPreferredPhy(pr.getPreferredTxPhy(),
-							pr.getPreferredRxPhy(), pr.getPreferredPhyOptions());
+					result = internalSetPreferredPhy(
+							pr.getPreferredTxPhy(),
+							pr.getPreferredRxPhy(),
+							pr.getPreferredPhyOptions()
+					);
+					if (Build.VERSION.SDK_INT == Build.VERSION_CODES.TIRAMISU) {
+						// There seems to be a bug on Android 13, where there is no callback
+						// for setPreferredPhy(...). onPhyUpdate(...) should be called, but it is not.
+						// See: https://github.com/NordicSemiconductor/Android-BLE-Library/issues/414
+						// However, the operation seems to complete successfully.
+						// As a workaround, let's read the PHYs and notify the user.
+						handler.postDelayed(() -> {
+							if (!pr.finished) {
+								log(Log.WARN, () -> "Callback not received in 1000 ms");
+								internalReadPhy();
+							}
+						}, 1000);
+					}
 				} else {
 					result = connected;
 					if (result) {