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

Commit d21614c1 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

BluetoothCsipSetCoordinator: Fix typo in return parameter am: 85eeb83e am:... 

BluetoothCsipSetCoordinator: Fix typo in return parameter am: 85eeb83e am: 376dd007 am: f0f2871c am: 9fcba3b4

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

Change-Id: If233922a874d55c0af80787dd30acca469d736e6
parents a1517246 9fcba3b4

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ package android.bluetooth { 
  public final class BluetoothCsipSetCoordinator implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<java.lang.Integer> getAllGroupIds(@Nullable android.os.ParcelUuid);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.Map getGroupUuidMapByDevice(@Nullable android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.Map<java.lang.Integer,android.os.ParcelUuid> getGroupUuidMapByDevice(@Nullable android.bluetooth.BluetoothDevice);

    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.UUID lockGroup(int, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothCsipSetCoordinator.ClientLockCallback);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean unlockGroup(@NonNull java.util.UUID);

framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public @NonNull Map getGroupUuidMapByDevice(@Nullable BluetoothDevice device) {

    public @NonNull Map<Integer, ParcelUuid> getGroupUuidMapByDevice(

            @Nullable BluetoothDevice device) {

        if (VDBG) log("getGroupUuidMapByDevice()");

        final IBluetoothCsipSetCoordinator service = getService();

        final Map defaultValue = new HashMap<>();