Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55f7d21 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 38c97237 7a090a11

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }

            }