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

Commit 09d7a8a8 authored by Michal Belusiak's avatar Michal Belusiak Committed by Automerger Merge Worker
Browse files

Merge "BluetoothVolumeControl: Add default implementation to deprecated... 

Merge "BluetoothVolumeControl: Add default implementation to deprecated callback API" into main am: efdde0fc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2995270



Change-Id: I35cce772511b3474599a76198702e2cb5cd3b454
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3766cbed efdde0fc

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/VolumeControlProfileTest.java

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class VolumeControlProfileTest { 
        mServiceListener.onServiceConnected(BluetoothProfile.VOLUME_CONTROL, mService);



        final Executor executor = (command -> new Thread(command).start());

        final BluetoothVolumeControl.Callback callback = (device, volumeOffset) -> {};

        final BluetoothVolumeControl.Callback callback = new BluetoothVolumeControl.Callback() {};

        mProfile.registerCallback(executor, callback);



        verify(mService).registerCallback(executor, callback);
@@ -200,7 +200,7 @@ public class VolumeControlProfileTest { 


    @Test

    public void unregisterCallback_verifyIsCalled() {

        final BluetoothVolumeControl.Callback callback = (device, volumeOffset) -> {};

        final BluetoothVolumeControl.Callback callback = new BluetoothVolumeControl.Callback() {};

        mServiceListener.onServiceConnected(BluetoothProfile.VOLUME_CONTROL, mService);



        mProfile.unregisterCallback(callback);