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

Commit f937c37b authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

Merge "Annotate setTransportBlockFilter with required permissions." into main am: 1daeac1e 

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



Change-Id: I5199be3940c7fc79a8f228f333260f84dba11822
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39a929fa 1daeac1e

framework/api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -1401,7 +1401,7 @@ package android.bluetooth.le { 
  public static final class ScanFilter.Builder {

  public static final class ScanFilter.Builder {

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(@NonNull String, int);

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(@NonNull String, int);

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(@NonNull String, int, @NonNull byte[]);

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(@NonNull String, int, @NonNull byte[]);

    method @NonNull public android.bluetooth.le.ScanFilter.Builder setTransportBlockFilter(@NonNull android.bluetooth.le.TransportBlockFilter);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.le.ScanFilter.Builder setTransportBlockFilter(@NonNull android.bluetooth.le.TransportBlockFilter);

    field public static final int LEN_IRK_OCTETS = 16; // 0x10

    field public static final int LEN_IRK_OCTETS = 16; // 0x10

  }

  }

framework/java/android/bluetooth/le/ScanFilter.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -20,11 +20,13 @@ import static java.util.Objects.requireNonNull; 




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice.AddressType;

import android.bluetooth.BluetoothDevice.AddressType;

import android.bluetooth.BluetoothStatusCodes;

import android.bluetooth.BluetoothStatusCodes;

import android.bluetooth.annotations.RequiresBluetoothScanPermission;

import android.bluetooth.le.ScanRecord.AdvertisingDataType;

import android.bluetooth.le.ScanRecord.AdvertisingDataType;

import android.os.Parcel;

import android.os.Parcel;

import android.os.ParcelUuid;

import android.os.ParcelUuid;
@@ -1037,6 +1039,12 @@ public final class ScanFilter implements Parcelable { 
         * @hide

         * @hide

         */

         */

        @SystemApi

        @SystemApi

        @RequiresBluetoothScanPermission

        @RequiresPermission(

                allOf = {

                    android.Manifest.permission.BLUETOOTH_SCAN,

                    android.Manifest.permission.BLUETOOTH_PRIVILEGED,

                })

        @NonNull

        @NonNull

        public Builder setTransportBlockFilter(@NonNull TransportBlockFilter transportBlockFilter) {

        public Builder setTransportBlockFilter(@NonNull TransportBlockFilter transportBlockFilter) {

            BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

            BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();