PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-03 17:43:40 +00:00
committed by Gerrit Code Review
parent a604afe5de 33c7e03b6a
commit e270a6aa85
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/bluetooth/DevicePickerFragment.java
View File

@@ -103,12 +103,24 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
addCachedDevices(); addCachedDevices();
mSelectedDevice = null;
if (mStartScanOnStart) { if (mStartScanOnStart) {
mLocalAdapter.startScanning(true); mLocalAdapter.startScanning(true);
mStartScanOnStart = false; 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 @Override
void onDevicePreferenceClick(BluetoothDevicePreference btPreference) { void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
mLocalAdapter.stopScanning(); mLocalAdapter.stopScanning();