am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"

* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2': Fixed a memory leak in the bluetooth settings
2011-02-04 16:20:15 -08:00
parent 2b78f43322 1798fc049e
commit 47cb175396
1 changed files with 3 additions and 2 deletions
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -161,8 +161,6 @@ public class BluetoothSettings extends PreferenceActivity

        // Repopulate (which isn't too bad since it's cached in the settings
        // bluetooth manager
-        mDevicePreferenceMap.clear();
-        mDeviceList.removeAll();
        addDevices();

        if (mScreenType == SCREEN_TYPE_SETTINGS) {
@@ -187,6 +185,9 @@ public class BluetoothSettings extends PreferenceActivity
    protected void onPause() {
        super.onPause();

+        mDevicePreferenceMap.clear();
+        mDeviceList.removeAll();
+
        mLocalManager.setForegroundActivity(null);
        mDevicePreferenceMap.clear();
        mDeviceList.removeAll();