Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE during restartBleScan() when scanner is null" into sc-v2-dev

Browse Source
This commit is contained in:
Guojing Yuan
2021-11-01 23:13:21 +00:00
committed by Android (Google) Code Review
parent fdf6eedb10 6e7bf2578f
commit e5e42892c5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -1451,8 +1451,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
void restartBleScan() { void restartBleScan() {
mBluetoothAdapter.getBluetoothLeScanner().stopScan(mBleScanCallback); if (mBluetoothAdapter.getBluetoothLeScanner() != null) {
startBleScan(); mBluetoothAdapter.getBluetoothLeScanner().stopScan(mBleScanCallback);
startBleScan();
} else {
Slog.w(LOG_TAG, "BluetoothLeScanner is null (likely BLE isn't ON yet).");
}
} }
private List<ScanFilter> getBleScanFilters() { private List<ScanFilter> getBleScanFilters() {