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

Commit 8490abf1 authored by Hemant Gupta's avatar Hemant Gupta Committed by Ricardo Cerqueira
Browse files

Bluetooth: Add support for HID Device Role 

This patch adds the HID Device Role support in Bluetooth framework.
Also AIDL and callback related files for HID Device role are added
to provide interface for third party applications to communicate with
HID device Service.

Change-Id: Id03a362b7bcfa2e76056fa0197eaac12ce49b5a2
parent aaa20127

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothMap.aidl \

	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \

	core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \

	core/java/android/bluetooth/IBluetoothHidDevice.aidl \

	core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \

	core/java/android/bluetooth/IBluetoothGatt.aidl \

	core/java/android/bluetooth/IBluetoothGattCallback.aidl \

	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \

core/java/android/bluetooth/BluetoothAdapter.java

+7 −0
Original line number Diff line number Diff line
@@ -1422,6 +1422,9 @@ public final class BluetoothAdapter { 
        } else if (profile == BluetoothProfile.HEADSET_CLIENT) {

            BluetoothHeadsetClient headsetClient = new BluetoothHeadsetClient(context, listener);

            return true;

        } else if (profile == BluetoothProfile.HID_DEVICE) {

            BluetoothHidDevice hidd = new BluetoothHidDevice(context, listener);

            return true;

        } else {

            return false;

        }
@@ -1493,6 +1496,10 @@ public final class BluetoothAdapter { 
                BluetoothHeadsetClient headsetClient = (BluetoothHeadsetClient)proxy;

                headsetClient.close();

                break;

            case BluetoothProfile.HID_DEVICE:

                BluetoothHidDevice hidd = (BluetoothHidDevice) proxy;

                hidd.close();

                break;

        }

    }

core/java/android/bluetooth/BluetoothHidDevice.java

+313 −463

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl

+3 −1
Original line number Diff line number Diff line 
/*

** Copyright (C) 2013 The Linux Foundation. All rights reserved

** Not a Contribution.

** Copyright 2011, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +18,4 @@ 


package android.bluetooth;



parcelable BluetoothHealthAppConfiguration;
 
parcelable BluetoothHidDeviceAppConfiguration;

core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.java

+24 −117
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Linux Foundation. All rights reserved

 * Not a Contribution.

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,152 +16,57 @@ 
 * limitations under the License.

 */





package android.bluetooth;



import android.os.Parcel;

import android.os.Parcelable;



/**

 * The Bluetooth Health Application Configuration that is used in conjunction with

 * the {@link BluetoothHealth} class. This class represents an application configuration

 * that the Bluetooth Health third party application will register to communicate with the

 * remote Bluetooth health device.

 *

 */

public final class BluetoothHealthAppConfiguration implements Parcelable {

    private final String mName;

    private final int mDataType;

    private final int mRole;

    private final int mChannelType;

import java.util.Random;



    /**

     * Constructor to register the SINK role

     *

     * @param name Friendly name associated with the application configuration

     * @param dataType Data Type of the remote Bluetooth Health device

     * @hide

     */

    BluetoothHealthAppConfiguration(String name, int dataType) {

        mName = name;

        mDataType = dataType;

        mRole = BluetoothHealth.SINK_ROLE;

        mChannelType = BluetoothHealth.CHANNEL_TYPE_ANY;

/** @hide */

public final class BluetoothHidDeviceAppConfiguration implements Parcelable {

    private final long mHash;



    BluetoothHidDeviceAppConfiguration() {

        Random rnd = new Random();

        mHash = rnd.nextLong();

    }



    /**

     * Constructor to register the application configuration.

     *

     * @param name Friendly name associated with the application configuration

     * @param dataType Data Type of the remote Bluetooth Health device

     * @param role {@link BluetoothHealth#SOURCE_ROLE} or

     *                     {@link BluetoothHealth#SINK_ROLE}

     * @hide

     */

    BluetoothHealthAppConfiguration(String name, int dataType, int role, int

        channelType) {

        mName = name;

        mDataType = dataType;

        mRole = role;

        mChannelType = channelType;

    BluetoothHidDeviceAppConfiguration(long hash) {

        mHash = hash;

    }



    @Override

    public boolean equals(Object o) {

        if (o instanceof BluetoothHealthAppConfiguration) {

            BluetoothHealthAppConfiguration config = (BluetoothHealthAppConfiguration) o;

            // config.getName() can never be NULL

            return mName.equals(config.getName()) &&

                    mDataType == config.getDataType() &&

                    mRole == config.getRole() &&

                    mChannelType == config.getChannelType();

        if (o instanceof BluetoothHidDeviceAppConfiguration) {

            BluetoothHidDeviceAppConfiguration config = (BluetoothHidDeviceAppConfiguration) o;

            return mHash == config.mHash;

        }

        return false;

    }



    @Override

    public int hashCode() {

        int result = 17;

        result = 31 * result + (mName != null ? mName.hashCode() : 0);

        result = 31 * result + mDataType;

        result = 31 * result + mRole;

        result = 31 * result + mChannelType;

        return result;

    }



    @Override

    public String toString() {

        return "BluetoothHealthAppConfiguration [mName = " + mName +

            ",mDataType = " + mDataType + ", mRole = " + mRole + ",mChannelType = " +

            mChannelType + "]";

    }



    public int describeContents() {

        return 0;

    }



    /**

     * Return the data type associated with this application configuration.

     *

     * @return dataType

     */

    public int getDataType() {

        return mDataType;

    }



    /**

     * Return the name of the application configuration.

     *

     * @return String name

     */

    public String getName() {

        return mName;

    }



    /**

     * Return the role associated with this application configuration.

     *

     * @return One of {@link BluetoothHealth#SOURCE_ROLE} or

     *                         {@link BluetoothHealth#SINK_ROLE}

     */

    public int getRole() {

        return mRole;

    }

    public static final Parcelable.Creator<BluetoothHidDeviceAppConfiguration> CREATOR =

        new Parcelable.Creator<BluetoothHidDeviceAppConfiguration>() {



    /**

     * Return the channel type associated with this application configuration.

     *

     * @return One of {@link BluetoothHealth#CHANNEL_TYPE_RELIABLE} or

     *                         {@link BluetoothHealth#CHANNEL_TYPE_STREAMING} or

     *                         {@link BluetoothHealth#CHANNEL_TYPE_ANY}.

     * @hide

     */

    public int getChannelType() {

        return mChannelType;

    }



    public static final Parcelable.Creator<BluetoothHealthAppConfiguration> CREATOR =

        new Parcelable.Creator<BluetoothHealthAppConfiguration>() {

        @Override

        public BluetoothHealthAppConfiguration createFromParcel(Parcel in) {

            String name = in.readString();

            int type = in.readInt();

            int role = in.readInt();

            int channelType = in.readInt();

            return new BluetoothHealthAppConfiguration(name, type, role,

                channelType);

        public BluetoothHidDeviceAppConfiguration createFromParcel(Parcel in) {

            long hash = in.readLong();

            return new BluetoothHidDeviceAppConfiguration(hash);

        }



        @Override

        public BluetoothHealthAppConfiguration[] newArray(int size) {

            return new BluetoothHealthAppConfiguration[size];

        public BluetoothHidDeviceAppConfiguration[] newArray(int size) {

            return new BluetoothHidDeviceAppConfiguration[size];

        }

    };



    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeString(mName);

        out.writeInt(mDataType);

        out.writeInt(mRole);

        out.writeInt(mChannelType);

        out.writeLong(mHash);

    }

}