Merge changes from topic 'HID-Client' (efcfb8aa) · Commits · e / os / android_packages_modules_Bluetooth

framework/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;
		}
		}

framework/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;

framework/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);
		}
		}

framework/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;

framework/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java

0 → 100644

+97 −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 BluetoothHidDeviceAppQosSettings implements Parcelable {

		final public int serviceType;
		final public int tokenRate;
		final public int tokenBucketSize;
		final public int peakBandwidth;
		final public int latency;
		final public int delayVariation;

		final static public int SERVICE_NO_TRAFFIC = 0x00;
		final static public int SERVICE_BEST_EFFORT = 0x01;
		final static public int SERVICE_GUARANTEED = 0x02;

		final static public int MAX = (int) 0xffffffff;

		public BluetoothHidDeviceAppQosSettings(int serviceType, int tokenRate, int tokenBucketSize,
		int peakBandwidth,
		int latency, int delayVariation) {
		this.serviceType = serviceType;
		this.tokenRate = tokenRate;
		this.tokenBucketSize = tokenBucketSize;
		this.peakBandwidth = peakBandwidth;
		this.latency = latency;
		this.delayVariation = delayVariation;
		}

		@Override
		public boolean equals(Object o) {
		if (o instanceof BluetoothHidDeviceAppQosSettings) {
		BluetoothHidDeviceAppQosSettings qos = (BluetoothHidDeviceAppQosSettings) o;
		return false;
		}
		return false;
		}

		@Override
		public int describeContents() {
		return 0;
		}

		public static final Parcelable.Creator<BluetoothHidDeviceAppQosSettings> CREATOR =
		new Parcelable.Creator<BluetoothHidDeviceAppQosSettings>() {

		@Override
		public BluetoothHidDeviceAppQosSettings createFromParcel(Parcel in) {

		return new BluetoothHidDeviceAppQosSettings(in.readInt(), in.readInt(), in.readInt(),
		in.readInt(),
		in.readInt(), in.readInt());
		}

		@Override
		public BluetoothHidDeviceAppQosSettings[] newArray(int size) {
		return new BluetoothHidDeviceAppQosSettings[size];
		}
		};

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(serviceType);
		out.writeInt(tokenRate);
		out.writeInt(tokenBucketSize);
		out.writeInt(peakBandwidth);
		out.writeInt(latency);
		out.writeInt(delayVariation);
		}

		public int[] toArray() {
		return new int[] {
		serviceType, tokenRate, tokenBucketSize, peakBandwidth, latency, delayVariation
		};
		}
		}