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

Commit c3b5ec7c authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "Publish Bluetooth HID Device Profile Service API" 

am: fbd4ea125f

Change-Id: I97a3b9f865af9d50d52674702c6706729f9ab419
parents 951428e2 362004ef

framework/java/android/bluetooth/BluetoothHidDevice.java

+1 −3
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 {
@@ -79,7 +77,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { 
    public static final byte SUBCLASS2_GAMEPAD = (byte) 0x02;

    public static final byte SUBCLASS2_REMOTE_CONTROL = (byte) 0x03;

    public static final byte SUBCLASS2_SENSING_DEVICE = (byte) 0x04;

    public static final byte SUBCLASS2_DIGITIZER_TABLED = (byte) 0x05;

    public static final byte SUBCLASS2_DIGITIZER_TABLET = (byte) 0x05;

    public static final byte SUBCLASS2_CARD_READER = (byte) 0x06;



    /**

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 {

framework/java/android/bluetooth/BluetoothProfile.java

+0 −2
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ public interface BluetoothProfile { 


    /**

     * HID Device

     *

     * @hide

     */

    public static final int HID_DEVICE = 19;