commit 1fe94d4fd7c6ad6c8753712d1c173cd6e29770ea
author Fan Zhang <zhfan@google.com> Thu Jun 07 18:14:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 07 18:14:01 2018 -0700
tree 22261827eb7f6d2b54e8919e80898a50cd024e48
parent d4fba829987ddd7bd9c3d1ba3d481e319b306a68
parent ee96c3a259ad1ee3a8604730f8c722224ec07a50

Fix context leak in AudioSwitchPreferenceController.
am: ee96c3a259

Change-Id: I3575074241ee60d573563edbffa214f0d705bea3

src/com/android/settings/sound/AudioSwitchPreferenceController.java

diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index 44e175c..6723660 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -118,7 +118,6 @@
             Log.e(TAG, "Bluetooth is not supported on this device");
             return;
         }
-        mLocalBluetoothManager.setForegroundActivity(mContext);
         mProfileManager = mLocalBluetoothManager.getProfileManager();
     }
 
@@ -171,11 +170,13 @@
 
     @Override
     public void onStart() {
+        mLocalBluetoothManager.setForegroundActivity(mContext);
         register();
     }
 
     @Override
     public void onStop() {
+        mLocalBluetoothManager.setForegroundActivity(null);
         unregister();
     }
 

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
index 2455f16..1140aee 100644
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -230,6 +230,7 @@
         verify(mLocalBluetoothManager.getEventManager()).registerCallback(
                 any(BluetoothCallback.class));
         verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
+        verify(mLocalBluetoothManager).setForegroundActivity(mContext);
     }
 
     @Test
@@ -240,6 +241,7 @@
         verify(mLocalBluetoothManager.getEventManager()).unregisterCallback(
                 any(BluetoothCallback.class));
         verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
+        verify(mLocalBluetoothManager).setForegroundActivity(null);
     }
 
     @Test