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

Commit 87bb929d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix context leak in AudioSwitchPreferenceController."

parents 681ac5bc d9f7fba9

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

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

    }

    }

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -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