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

Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-28 23:54:49 +00:00
committed by Android (Google) Code Review
parent 38c97237e3 7a090a11ed
commit c55f7d2180
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
View File

@@ -77,7 +77,7 @@ public class DeviceDiscoveryService extends Service {
private BluetoothAdapter mBluetoothAdapter;
private WifiManager mWifiManager;
private BluetoothLeScanner mBLEScanner;
@Nullable private BluetoothLeScanner mBLEScanner;
private ScanSettings mDefaultScanSettings = new ScanSettings.Builder().build();
private List<DeviceFilter<?>> mFilters;
@@ -185,7 +185,7 @@ public class DeviceDiscoveryService extends Service {
mBluetoothAdapter.startDiscovery();
}
if (shouldScan(mBLEFilters)) {
if (shouldScan(mBLEFilters) && mBLEScanner != null) {
mBLEScanCallback = new BLEScanCallback();
mBLEScanner.startScan(mBLEScanFilters, mDefaultScanSettings, mBLEScanCallback);
}
@@ -224,7 +224,7 @@ public class DeviceDiscoveryService extends Service {
unregisterReceiver(mBluetoothBroadcastReceiver);
mBluetoothBroadcastReceiver = null;
}
mBLEScanner.stopScan(mBLEScanCallback);
if (mBLEScanner != null) mBLEScanner.stopScan(mBLEScanCallback);
if (mWifiBroadcastReceiver != null) {
unregisterReceiver(mWifiBroadcastReceiver);
mWifiBroadcastReceiver = null;

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

@@ -383,7 +383,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
findDeviceCallback,
getServiceCallback());
} catch (RemoteException e) {
throw new RuntimeException(e);
Log.e(LOG_TAG, "Error while initiating device discovery", e);
}
}