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

Commit b5e14d5f authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa

am: 2ffab51c

Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
parents c7ca1bcf 2ffab51c
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -103,12 +103,24 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
    public void onStart() {
        super.onStart();
        addCachedDevices();
        mSelectedDevice = null;
        if (mStartScanOnStart) {
            mLocalAdapter.startScanning(true);
            mStartScanOnStart = false;
        }
    }

    @Override
    public void onDestroy() {
        super.onDestroy();
        /* Check if any device was selected, if no device selected
         * send  ACTION_DEVICE_SELECTED with a null device, otherwise
         * don't do anything */
        if (mSelectedDevice == null) {
            sendDevicePickedIntent(null);
        }
    }

    @Override
    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
        mLocalAdapter.stopScanning();