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

Commit 2c8678b7 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "BroadcastAssistant: Fix annotated permission" into main

parents b78f691f 46b9fe77

framework/api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -589,14 +589,14 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);

    method public int getMaximumSourceCapacity(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isSearchInProgress();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getMaximumSourceCapacity(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isSearchInProgress();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void modifySource(@NonNull android.bluetooth.BluetoothDevice, int, @NonNull android.bluetooth.BluetoothLeBroadcastMetadata);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothLeBroadcastAssistant.Callback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void removeSource(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void startSearchingForSources(@NonNull java.util.List<android.bluetooth.le.ScanFilter>);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void stopSearchingForSources();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void stopSearchingForSources();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void unregisterCallback(@NonNull android.bluetooth.BluetoothLeBroadcastAssistant.Callback);

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.action.CONNECTION_STATE_CHANGED";

  }

framework/java/android/bluetooth/BluetoothLeBroadcastAssistant.java

+10 −4
Original line number Diff line number Diff line
@@ -890,10 +890,10 @@ public final class BluetoothLeBroadcastAssistant implements BluetoothProfile, Au 
     * @hide

     */

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresBluetoothScanPermission

    @RequiresPermission(

            allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_SCAN,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

            })

    public void stopSearchingForSources() {
@@ -928,10 +928,10 @@ public final class BluetoothLeBroadcastAssistant implements BluetoothProfile, Au 
     * @hide

     */

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresBluetoothScanPermission

    @RequiresPermission(

            allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_SCAN,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

            })

    public boolean isSearchInProgress() {
@@ -1225,6 +1225,12 @@ public final class BluetoothLeBroadcastAssistant implements BluetoothProfile, Au 
     * @hide

     */

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresPermission(

            allOf = {

                android.Manifest.permission.BLUETOOTH_CONNECT,

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

            })

    public int getMaximumSourceCapacity(@NonNull BluetoothDevice sink) {

        Objects.requireNonNull(sink, "sink cannot be null");

        final IBluetoothLeBroadcastAssistant service = getService();