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

Commit e81a6dff authored by Eugene Susla's avatar Eugene Susla Committed by android-build-merger
Browse files

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

am: 8e079af6

Change-Id: I739f5aa80a75f34230593173f2536fe8d0e33bca
parents 89e31ac2 8e079af6

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ public class DeviceDiscoveryService extends Service { 




    private BluetoothAdapter mBluetoothAdapter;

    private BluetoothAdapter mBluetoothAdapter;

    private WifiManager mWifiManager;

    private WifiManager mWifiManager;

    private BluetoothLeScanner mBLEScanner;

    @Nullable private BluetoothLeScanner mBLEScanner;

    private ScanSettings mDefaultScanSettings = new ScanSettings.Builder().build();

    private ScanSettings mDefaultScanSettings = new ScanSettings.Builder().build();





    private List<DeviceFilter<?>> mFilters;

    private List<DeviceFilter<?>> mFilters;
@@ -185,7 +185,7 @@ public class DeviceDiscoveryService extends Service { 
            mBluetoothAdapter.startDiscovery();

            mBluetoothAdapter.startDiscovery();

        }

        }





        if (shouldScan(mBLEFilters)) {

        if (shouldScan(mBLEFilters) && mBLEScanner != null) {

            mBLEScanCallback = new BLEScanCallback();

            mBLEScanCallback = new BLEScanCallback();

            mBLEScanner.startScan(mBLEScanFilters, mDefaultScanSettings, mBLEScanCallback);

            mBLEScanner.startScan(mBLEScanFilters, mDefaultScanSettings, mBLEScanCallback);

        }

        }
@@ -224,7 +224,7 @@ public class DeviceDiscoveryService extends Service { 
            unregisterReceiver(mBluetoothBroadcastReceiver);

            unregisterReceiver(mBluetoothBroadcastReceiver);

            mBluetoothBroadcastReceiver = null;

            mBluetoothBroadcastReceiver = null;

        }

        }

        mBLEScanner.stopScan(mBLEScanCallback);

        if (mBLEScanner != null) mBLEScanner.stopScan(mBLEScanCallback);

        if (mWifiBroadcastReceiver != null) {

        if (mWifiBroadcastReceiver != null) {

            unregisterReceiver(mWifiBroadcastReceiver);

            unregisterReceiver(mWifiBroadcastReceiver);

            mWifiBroadcastReceiver = null;

            mWifiBroadcastReceiver = null;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -383,7 +383,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
                                    findDeviceCallback,

                                    findDeviceCallback,

                                    getServiceCallback());

                                    getServiceCallback());

                } catch (RemoteException e) {

                } catch (RemoteException e) {

                    throw new RuntimeException(e);

                    Log.e(LOG_TAG, "Error while initiating device discovery", e);

                }

                }

            }

            }