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

Commit 47cb1753 authored by Jake Hamby's avatar Jake Hamby Committed by Android Git Automerger
Browse files

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

* commit '1798fc04':
  Fixed a memory leak in the bluetooth settings
parents 2b78f433 1798fc04

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

+3 −2
Original line number Diff line number Diff line
@@ -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();