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

Commit 6d194380 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: f4dca4b5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2994215



Change-Id: I828d16ac1e60931ab379359819f540c6baa4c303
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5106445d f4dca4b5

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ package android.bluetooth { 
    method @FlaggedApi("com.android.bluetooth.flags.leaudio_broadcast_volume_control_for_connected_devices") public default void onDeviceVolumeChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0, to=255) int);

    method @FlaggedApi("com.android.bluetooth.flags.leaudio_multiple_vocs_instances_api") public default void onVolumeOffsetAudioDescriptionChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @NonNull String);

    method @FlaggedApi("com.android.bluetooth.flags.leaudio_multiple_vocs_instances_api") public default void onVolumeOffsetAudioLocationChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @IntRange(from=0xffffff01, to=255) int);

    method @Deprecated public void onVolumeOffsetChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0xffffff01, to=255) int);

    method @Deprecated public default void onVolumeOffsetChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=0xffffff01, to=255) int);

    method @FlaggedApi("com.android.bluetooth.flags.leaudio_multiple_vocs_instances_api") public default void onVolumeOffsetChanged(@NonNull android.bluetooth.BluetoothDevice, @IntRange(from=1, to=255) int, @IntRange(from=0xffffff01, to=255) int);

  }

framework/java/android/bluetooth/BluetoothVolumeControl.java

+3 −2
Original line number Diff line number Diff line
@@ -94,8 +94,9 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 
         */

        @Deprecated

        @SystemApi

        void onVolumeOffsetChanged(

                @NonNull BluetoothDevice device, @IntRange(from = -255, to = 255) int volumeOffset);

        default void onVolumeOffsetChanged(

                @NonNull BluetoothDevice device,

                @IntRange(from = -255, to = 255) int volumeOffset) {}



        /**

         * Callback invoked when callback is registered and when volume offset changes on the remote