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 am: e5e42892c5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16166922

Change-Id: I10eda75d84c2226376bebb0f1463cce2a58eb12a
This commit is contained in:
Guojing Yuan
2021-11-01 23:29:12 +00:00
committed by Automerger Merge Worker
parent 7d384d46d4 e5e42892c5
commit 5a093c5a74
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() {