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

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

Browse Source 
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
  Fixed a memory leak in the bluetooth settings
This commit is contained in:
Jake Hamby
2011-02-04 16:20:15 -08:00
committed by Android Git Automerger
parent 2b78f43322 1798fc049e
commit 47cb175396
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -161,8 +161,6 @@ public class BluetoothSettings extends PreferenceActivity
// Repopulate (which isn't too bad since it's cached in the settings // Repopulate (which isn't too bad since it's cached in the settings
// bluetooth manager // bluetooth manager
mDevicePreferenceMap.clear();
mDeviceList.removeAll();
addDevices(); addDevices();
if (mScreenType == SCREEN_TYPE_SETTINGS) { if (mScreenType == SCREEN_TYPE_SETTINGS) {
@@ -187,6 +185,9 @@ public class BluetoothSettings extends PreferenceActivity
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
mDevicePreferenceMap.clear();
mDeviceList.removeAll();
mLocalManager.setForegroundActivity(null); mLocalManager.setForegroundActivity(null);
mDevicePreferenceMap.clear(); mDevicePreferenceMap.clear();
mDeviceList.removeAll(); mDeviceList.removeAll();