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

Commit 96db9a74 authored by Qasim Javed's avatar Qasim Javed Committed by Automerger Merge Worker
Browse files

Merge "Make createBond(int) a system API" into stage-aosp-master am: 5a4c7d4a 

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

Change-Id: I0e621e1aab15fa6e5e06fa8f8e4df82eab1c549c
parents 85c72879 5a4c7d4a

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1981,6 +1981,7 @@ package android.bluetooth { 
  public final class BluetoothDevice implements android.os.Parcelable {

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

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean cancelBondProcess();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBond(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBondOutOfBand(int, @Nullable android.bluetooth.OobData, @Nullable android.bluetooth.OobData);

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

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public byte[] getMetadata(int);

core/java/android/bluetooth/BluetoothDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     * @throws IllegalArgumentException if an invalid transport was specified

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)