commit e270a6aa85f86d0c3c2f7b987abde3fc3ac4048a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 03 17:43:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 03 17:43:42 2017 +0000
tree ef6f22836387983c9e5f5059c9ab388a3e8a3adb
parent a604afe5de1c9e00f3b312434b99dd35f06b471b
parent 33c7e03b6ac9749ba07d326a869307d908feba2e

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

src/com/android/settings/bluetooth/DevicePickerFragment.java

diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 00c7316..f07b7ac 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -103,6 +103,7 @@
     public void onStart() {
         super.onStart();
         addCachedDevices();
+        mSelectedDevice = null;
         if (mStartScanOnStart) {
             mLocalAdapter.startScanning(true);
             mStartScanOnStart = false;
@@ -110,6 +111,17 @@
     }
 
     @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();
         LocalBluetoothPreferences.persistSelectedDeviceInPicker(