Fix context leak in AudioSwitchPreferenceController.

am: ee96c3a259 Change-Id: I3575074241ee60d573563edbffa214f0d705bea3
2018-06-07 18:14:01 -07:00
parent d4fba82998 ee96c3a259
commit 1fe94d4fd7
2 changed files with 4 additions and 1 deletions
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -118,7 +118,6 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
            Log.e(TAG, "Bluetooth is not supported on this device");
            return;
        }
-        mLocalBluetoothManager.setForegroundActivity(mContext);
        mProfileManager = mLocalBluetoothManager.getProfileManager();
    }

@@ -171,11 +170,13 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont

    @Override
    public void onStart() {
+        mLocalBluetoothManager.setForegroundActivity(mContext);
        register();
    }

    @Override
    public void onStop() {
+        mLocalBluetoothManager.setForegroundActivity(null);
        unregister();
    }