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

Commit f6551b6f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4507345 from d6815d74dd051c0881cbbfa9fb68a8f91a6634bd to pi-release 

Change-Id: I2aa3c47e2acaf1fd28f934c74ae599d508f807d8
parents 6e0fa1d4 9b7f62a5

framework/java/android/bluetooth/BluetoothAdapter.java

+6 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public final class BluetoothAdapter { 
            "android.bluetooth.adapter.extra.PREVIOUS_STATE";



    /** @hide */

    @IntDef({

    @IntDef(prefix = { "STATE_" }, value = {

            STATE_OFF,

            STATE_TURNING_ON,

            STATE_ON,
@@ -357,7 +357,11 @@ public final class BluetoothAdapter { 
            "android.bluetooth.adapter.extra.PREVIOUS_SCAN_MODE";



    /** @hide */

    @IntDef({SCAN_MODE_NONE, SCAN_MODE_CONNECTABLE, SCAN_MODE_CONNECTABLE_DISCOVERABLE})

    @IntDef(prefix = { "SCAN_" }, value = {

            SCAN_MODE_NONE,

            SCAN_MODE_CONNECTABLE,

            SCAN_MODE_CONNECTABLE_DISCOVERABLE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ScanMode {}

framework/java/android/bluetooth/BluetoothHidDevice.java

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import java.util.List; 
 *

 * <p>BluetoothHidDevice is a proxy object for controlling the Bluetooth HID Device Service via IPC.

 * Use {@link BluetoothAdapter#getProfileProxy} to get the BluetoothHidDevice proxy object.

 *

 * <p>{@hide}

 */

public final class BluetoothHidDevice implements BluetoothProfile {

framework/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java

+2 −6
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.os.Parcelable; 
 * registration.

 *

 * <p>{@see BluetoothHidDevice}

 *

 * <p>{@hide}

 */

public final class BluetoothHidDeviceAppQosSettings implements Parcelable {
@@ -46,10 +44,8 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { 


    /**

     * Create a BluetoothHidDeviceAppQosSettings object for the Bluetooth L2CAP channel. The QoS

     * Settings is optional. Recommended to use BluetoothHidDeviceAppQosSettings.Builder. {@see <a

     * href="https://www.bluetooth.com/specifications/profiles-overview">

     * https://www.bluetooth.com/specifications/profiles-overview </a> Bluetooth HID Specfication

     * v1.1.1 Section 5.2 and Appendix D }

     * Settings is optional. Recommended to use BluetoothHidDeviceAppQosSettings.Builder.

     * Please refer to Bluetooth HID Specfication v1.1.1 Section 5.2 and Appendix D for parameters.

     *

     * @param serviceType L2CAP service type

     * @param tokenRate L2CAP token rate

framework/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import java.util.Arrays; 
 * Android device can be discovered as a Bluetooth HID Device.

 *

 * <p>{@see BluetoothHidDevice}

 *

 * <p>{@hide}

 */

public final class BluetoothHidDeviceAppSdpSettings implements Parcelable {

framework/java/android/bluetooth/BluetoothHidDeviceCallback.java

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import android.util.Log; 
 * registration.

 *

 * <p>{@see BluetoothHidDevice}

 *

 * <p>{@hide}

 */

public abstract class BluetoothHidDeviceCallback {