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

Merge "Fix context leak in AudioSwitchPreferenceController."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-07 22:57:17 +00:00
committed by Android (Google) Code Review
parent 681ac5bcc3 d9f7fba943
commit 87bb929d7a
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");
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();
}

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

@@ -230,6 +230,7 @@ public class AudioOutputSwitchPreferenceControllerTest {
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 @@ public class AudioOutputSwitchPreferenceControllerTest {
verify(mLocalBluetoothManager.getEventManager()).unregisterCallback(
any(BluetoothCallback.class));
verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
verify(mLocalBluetoothManager).setForegroundActivity(null);
}
@Test