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

Fix context leak in AudioSwitchPreferenceController.

Browse Source 
In this controller the context is stored into a global singleton but was
not cleared, thus leaking context and associated views.

Change-Id: I4247f8ff753bc0a331c6c81a0e4b5b4bc41588de
Bug: 80507279
Test: robotests
Test: inspected hprof before/after change
This commit is contained in:
Fan Zhang
2018-06-07 11:51:09 -07:00
parent 60f2f06855
commit d9f7fba943
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/sound/AudioSwitchPreferenceController.java
View File

@@ -118,7 +118,6 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
Log.e(TAG, "Bluetooth is not supported on this device"); Log.e(TAG, "Bluetooth is not supported on this device");
return; return;
} }
mLocalBluetoothManager.setForegroundActivity(mContext);
mProfileManager = mLocalBluetoothManager.getProfileManager(); mProfileManager = mLocalBluetoothManager.getProfileManager();
} }
@@ -171,11 +170,13 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
@Override @Override
public void onStart() { public void onStart() {
mLocalBluetoothManager.setForegroundActivity(mContext);
register(); register();
} }
@Override @Override
public void onStop() { public void onStop() {
mLocalBluetoothManager.setForegroundActivity(null);
unregister(); unregister();
} }

2
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
View File

@@ -230,6 +230,7 @@ public class AudioOutputSwitchPreferenceControllerTest {
verify(mLocalBluetoothManager.getEventManager()).registerCallback( verify(mLocalBluetoothManager.getEventManager()).registerCallback(
any(BluetoothCallback.class)); any(BluetoothCallback.class));
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class)); verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
verify(mLocalBluetoothManager).setForegroundActivity(mContext);
} }
@Test @Test
@@ -240,6 +241,7 @@ public class AudioOutputSwitchPreferenceControllerTest {
verify(mLocalBluetoothManager.getEventManager()).unregisterCallback( verify(mLocalBluetoothManager.getEventManager()).unregisterCallback(
any(BluetoothCallback.class)); any(BluetoothCallback.class));
verify(mContext).unregisterReceiver(any(BroadcastReceiver.class)); verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
verify(mLocalBluetoothManager).setForegroundActivity(null);
} }
@Test @Test