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

Fix NPE during restartBleScan() when scanner is null

Browse Source 
Fix: 204533528

Test: N/A
Change-Id: If242e01979c381aab5538e93bdf889ea95e16a20
This commit is contained in:
Guojing Yuan
2021-11-01 20:36:24 +00:00
parent e1211c6726
commit 6e7bf2578f
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() {
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<ScanFilter> getBleScanFilters() {