diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 202876627117f..7c1e2da4d6a3b 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -1451,8 +1451,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } void restartBleScan() { - mBluetoothAdapter.getBluetoothLeScanner().stopScan(mBleScanCallback); - startBleScan(); + if (mBluetoothAdapter.getBluetoothLeScanner() != null) { + mBluetoothAdapter.getBluetoothLeScanner().stopScan(mBleScanCallback); + startBleScan(); + } else { + Slog.w(LOG_TAG, "BluetoothLeScanner is null (likely BLE isn't ON yet)."); + } } private List getBleScanFilters() {