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

Commit 8a74d044 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'HID-Client' 

* changes:
  Rename the Bluetooth profile classes for HID Device role.
  Bluetooth: Add support for HID Device Role
parents 895e2d7a 0afe190a

Android.mk

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

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

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

	core/java/android/bluetooth/IBluetoothInputHost.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
@@ -1940,6 +1940,9 @@ public final class BluetoothAdapter { 
        } else if (profile == BluetoothProfile.MAP_CLIENT) {

            BluetoothMapClient mapClient = new BluetoothMapClient(context, listener);

            return true;

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

            BluetoothInputHost iHost = new BluetoothInputHost(context, listener);

            return true;

        } else {

            return false;

        }
@@ -2016,6 +2019,10 @@ public final class BluetoothAdapter { 
                BluetoothMapClient mapClient = (BluetoothMapClient)proxy;

                mapClient.close();

                break;

            case BluetoothProfile.INPUT_HOST:

                BluetoothInputHost iHost = (BluetoothInputHost) proxy;

                iHost.close();

                break;

        }

    }

core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/



package android.bluetooth;



parcelable BluetoothHidDeviceAppConfiguration;

core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.java

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.bluetooth;



import android.os.Parcel;

import android.os.Parcelable;



import java.util.Random;



/** @hide */

public final class BluetoothHidDeviceAppConfiguration implements Parcelable {

    private final long mHash;



    BluetoothHidDeviceAppConfiguration() {

        Random rnd = new Random();

        mHash = rnd.nextLong();

    }



    BluetoothHidDeviceAppConfiguration(long hash) {

        mHash = hash;

    }



    @Override

    public boolean equals(Object o) {

        if (o instanceof BluetoothHidDeviceAppConfiguration) {

            BluetoothHidDeviceAppConfiguration config = (BluetoothHidDeviceAppConfiguration) o;

            return mHash == config.mHash;

        }

        return false;

    }



    @Override

    public int describeContents() {

        return 0;

    }



    public static final Parcelable.Creator<BluetoothHidDeviceAppConfiguration> CREATOR =

        new Parcelable.Creator<BluetoothHidDeviceAppConfiguration>() {



        @Override

        public BluetoothHidDeviceAppConfiguration createFromParcel(Parcel in) {

            long hash = in.readLong();

            return new BluetoothHidDeviceAppConfiguration(hash);

        }



        @Override

        public BluetoothHidDeviceAppConfiguration[] newArray(int size) {

            return new BluetoothHidDeviceAppConfiguration[size];

        }

    };



    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeLong(mHash);

    }

}

core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/



package android.bluetooth;



parcelable BluetoothHidDeviceAppQosSettings;