Merge "Change Bluetooth HID Profile Name (1/6)" (3497cf3e) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -2104,8 +2104,8 @@ public final class BluetoothAdapter {
		} else if (profile == BluetoothProfile.AVRCP_CONTROLLER) {
		BluetoothAvrcpController avrcp = new BluetoothAvrcpController(context, listener);
		return true;
		} else if (profile == BluetoothProfile.INPUT_DEVICE) {
		BluetoothInputDevice iDev = new BluetoothInputDevice(context, listener);
		} else if (profile == BluetoothProfile.HID_HOST) {
		BluetoothHidHost iDev = new BluetoothHidHost(context, listener);
		return true;
		} else if (profile == BluetoothProfile.PAN) {
		BluetoothPan pan = new BluetoothPan(context, listener);
		@@ -2128,8 +2128,8 @@ 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);
		} else if (profile == BluetoothProfile.HID_DEVICE) {
		BluetoothHidDevice hidDevice = new BluetoothHidDevice(context, listener);
		return true;
		} else {
		return false;
		@@ -2167,8 +2167,8 @@ public final class BluetoothAdapter {
		BluetoothAvrcpController avrcp = (BluetoothAvrcpController) proxy;
		avrcp.close();
		break;
		case BluetoothProfile.INPUT_DEVICE:
		BluetoothInputDevice iDev = (BluetoothInputDevice) proxy;
		case BluetoothProfile.HID_HOST:
		BluetoothHidHost iDev = (BluetoothHidHost) proxy;
		iDev.close();
		break;
		case BluetoothProfile.PAN:
		@@ -2207,9 +2207,9 @@ public final class BluetoothAdapter {
		BluetoothMapClient mapClient = (BluetoothMapClient) proxy;
		mapClient.close();
		break;
		case BluetoothProfile.INPUT_HOST:
		BluetoothInputHost iHost = (BluetoothInputHost) proxy;
		iHost.close();
		case BluetoothProfile.HID_DEVICE:
		BluetoothHidDevice hidDevice = (BluetoothHidDevice) proxy;
		hidDevice.close();
		break;
		}
		}

framework/java/android/bluetooth/BluetoothInputHost.java→framework/java/android/bluetooth/BluetoothHidDevice.java

+22 −22

Original line number	Diff line number	Diff line
		@@ -33,9 +33,9 @@ import java.util.List;
		/**
		* @hide
		*/
		public final class BluetoothInputHost implements BluetoothProfile {
		public final class BluetoothHidDevice implements BluetoothProfile {

		private static final String TAG = BluetoothInputHost.class.getSimpleName();
		private static final String TAG = BluetoothHidDevice.class.getSimpleName();

		/**
		* Intent used to broadcast the change in connection state of the Input
		@@ -57,7 +57,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_CONNECTION_STATE_CHANGED =
		"android.bluetooth.inputhost.profile.action.CONNECTION_STATE_CHANGED";
		"android.bluetooth.hiddevice.profile.action.CONNECTION_STATE_CHANGED";

		/**
		* Constants representing device subclass.
		@@ -113,7 +113,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		private ServiceListener mServiceListener;

		private volatile IBluetoothInputHost mService;
		private volatile IBluetoothHidDevice mService;

		private BluetoothAdapter mAdapter;

		@@ -205,23 +205,23 @@ public final class BluetoothInputHost implements BluetoothProfile {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		Log.d(TAG, "onServiceConnected()");
		mService = IBluetoothInputHost.Stub.asInterface(service);
		mService = IBluetoothHidDevice.Stub.asInterface(service);
		if (mServiceListener != null) {
		mServiceListener.onServiceConnected(BluetoothProfile.INPUT_HOST,
		BluetoothInputHost.this);
		mServiceListener.onServiceConnected(BluetoothProfile.HID_DEVICE,
		BluetoothHidDevice.this);
		}
		}
		public void onServiceDisconnected(ComponentName className) {
		Log.d(TAG, "onServiceDisconnected()");
		mService = null;
		if (mServiceListener != null) {
		mServiceListener.onServiceDisconnected(BluetoothProfile.INPUT_HOST);
		mServiceListener.onServiceDisconnected(BluetoothProfile.HID_DEVICE);
		}
		}
		};

		BluetoothInputHost(Context context, ServiceListener listener) {
		Log.v(TAG, "BluetoothInputHost");
		BluetoothHidDevice(Context context, ServiceListener listener) {
		Log.v(TAG, "BluetoothHidDevice");

		mContext = context;
		mServiceListener = listener;
		@@ -240,7 +240,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		}

		boolean doBind() {
		Intent intent = new Intent(IBluetoothInputHost.class.getName());
		Intent intent = new Intent(IBluetoothHidDevice.class.getName());
		ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);
		intent.setComponent(comp);
		if (comp == null \|\| !mContext.bindServiceAsUser(intent, mConnection, 0,
		@@ -285,7 +285,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		public List<BluetoothDevice> getConnectedDevices() {
		Log.v(TAG, "getConnectedDevices()");

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		return service.getConnectedDevices();
		@@ -306,7 +306,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
		Log.v(TAG, "getDevicesMatchingConnectionStates(): states=" + Arrays.toString(states));

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		return service.getDevicesMatchingConnectionStates(states);
		@@ -327,7 +327,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		public int getConnectionState(BluetoothDevice device) {
		Log.v(TAG, "getConnectionState(): device=" + device);

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		return service.getConnectionState(device);
		@@ -367,7 +367,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		return false;
		}

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		BluetoothHidDeviceAppConfiguration config =
		@@ -401,7 +401,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.unregisterApp(config);
		@@ -426,7 +426,7 @@ public final class BluetoothInputHost implements BluetoothProfile {
		public boolean sendReport(BluetoothDevice device, int id, byte[] data) {
		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.sendReport(device, id, data);
		@@ -454,7 +454,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.replyReport(device, type, id, data);
		@@ -480,7 +480,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.reportError(device, error);
		@@ -504,7 +504,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.unplug(device);
		@@ -529,7 +529,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.connect(device);
		@@ -553,7 +553,7 @@ public final class BluetoothInputHost implements BluetoothProfile {

		boolean result = false;

		final IBluetoothInputHost service = mService;
		final IBluetoothHidDevice service = mService;
		if (service != null) {
		try {
		result = service.disconnect(device);

framework/java/android/bluetooth/BluetoothInputDevice.java→framework/java/android/bluetooth/BluetoothHidHost.java

+35 −35

Original line number	Diff line number	Diff line
		@@ -35,16 +35,16 @@ import java.util.List;
		* This class provides the public APIs to control the Bluetooth Input
		* Device Profile.
		*
		* <p>BluetoothInputDevice is a proxy object for controlling the Bluetooth
		* <p>BluetoothHidHost is a proxy object for controlling the Bluetooth
		* Service via IPC. Use {@link BluetoothAdapter#getProfileProxy} to get
		* the BluetoothInputDevice proxy object.
		* the BluetoothHidHost proxy object.
		*
		* <p>Each method is protected with its appropriate permission.
		*
		* @hide
		*/
		public final class BluetoothInputDevice implements BluetoothProfile {
		private static final String TAG = "BluetoothInputDevice";
		public final class BluetoothHidHost implements BluetoothProfile {
		private static final String TAG = "BluetoothHidHost";
		private static final boolean DBG = true;
		private static final boolean VDBG = false;

		@@ -177,52 +177,52 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		* @hide
		*/
		public static final String EXTRA_PROTOCOL_MODE =
		"android.bluetooth.BluetoothInputDevice.extra.PROTOCOL_MODE";
		"android.bluetooth.BluetoothHidHost.extra.PROTOCOL_MODE";

		/**
		* @hide
		*/
		public static final String EXTRA_REPORT_TYPE =
		"android.bluetooth.BluetoothInputDevice.extra.REPORT_TYPE";
		"android.bluetooth.BluetoothHidHost.extra.REPORT_TYPE";

		/**
		* @hide
		*/
		public static final String EXTRA_REPORT_ID =
		"android.bluetooth.BluetoothInputDevice.extra.REPORT_ID";
		"android.bluetooth.BluetoothHidHost.extra.REPORT_ID";

		/**
		* @hide
		*/
		public static final String EXTRA_REPORT_BUFFER_SIZE =
		"android.bluetooth.BluetoothInputDevice.extra.REPORT_BUFFER_SIZE";
		"android.bluetooth.BluetoothHidHost.extra.REPORT_BUFFER_SIZE";

		/**
		* @hide
		*/
		public static final String EXTRA_REPORT = "android.bluetooth.BluetoothInputDevice.extra.REPORT";
		public static final String EXTRA_REPORT = "android.bluetooth.BluetoothHidHost.extra.REPORT";

		/**
		* @hide
		*/
		public static final String EXTRA_STATUS = "android.bluetooth.BluetoothInputDevice.extra.STATUS";
		public static final String EXTRA_STATUS = "android.bluetooth.BluetoothHidHost.extra.STATUS";

		/**
		* @hide
		*/
		public static final String EXTRA_VIRTUAL_UNPLUG_STATUS =
		"android.bluetooth.BluetoothInputDevice.extra.VIRTUAL_UNPLUG_STATUS";
		"android.bluetooth.BluetoothHidHost.extra.VIRTUAL_UNPLUG_STATUS";

		/**
		* @hide
		*/
		public static final String EXTRA_IDLE_TIME =
		"android.bluetooth.BluetoothInputDevice.extra.IDLE_TIME";
		"android.bluetooth.BluetoothHidHost.extra.IDLE_TIME";

		private Context mContext;
		private ServiceListener mServiceListener;
		private BluetoothAdapter mAdapter;
		private volatile IBluetoothInputDevice mService;
		private volatile IBluetoothHidHost mService;

		private final IBluetoothStateChangeCallback mBluetoothStateChangeCallback =
		new IBluetoothStateChangeCallback.Stub() {
		@@ -254,10 +254,10 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		};

		/**
		* Create a BluetoothInputDevice proxy object for interacting with the local
		* Create a BluetoothHidHost proxy object for interacting with the local
		* Bluetooth Service which handles the InputDevice profile
		*/
		/package/ BluetoothInputDevice(Context context, ServiceListener l) {
		/package/ BluetoothHidHost(Context context, ServiceListener l) {
		mContext = context;
		mServiceListener = l;
		mAdapter = BluetoothAdapter.getDefaultAdapter();
		@@ -275,7 +275,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		}

		boolean doBind() {
		Intent intent = new Intent(IBluetoothInputDevice.class.getName());
		Intent intent = new Intent(IBluetoothHidHost.class.getName());
		ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);
		intent.setComponent(comp);
		if (comp == null \|\| !mContext.bindServiceAsUser(intent, mConnection, 0,
		@@ -331,7 +331,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean connect(BluetoothDevice device) {
		if (DBG) log("connect(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.connect(device);
		@@ -371,7 +371,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean disconnect(BluetoothDevice device) {
		if (DBG) log("disconnect(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.disconnect(device);
		@@ -390,7 +390,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		@Override
		public List<BluetoothDevice> getConnectedDevices() {
		if (VDBG) log("getConnectedDevices()");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled()) {
		try {
		return service.getConnectedDevices();
		@@ -409,7 +409,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		@Override
		public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
		if (VDBG) log("getDevicesMatchingStates()");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled()) {
		try {
		return service.getDevicesMatchingConnectionStates(states);
		@@ -428,7 +428,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		@Override
		public int getConnectionState(BluetoothDevice device) {
		if (VDBG) log("getState(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getConnectionState(device);
		@@ -458,7 +458,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) log("setPriority(" + device + ", " + priority + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		if (priority != BluetoothProfile.PRIORITY_OFF
		&& priority != BluetoothProfile.PRIORITY_ON) {
		@@ -490,7 +490,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public int getPriority(BluetoothDevice device) {
		if (VDBG) log("getPriority(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getPriority(device);
		@@ -506,11 +506,11 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");
		mService = IBluetoothInputDevice.Stub.asInterface(Binder.allowBlocking(service));
		mService = IBluetoothHidHost.Stub.asInterface(Binder.allowBlocking(service));

		if (mServiceListener != null) {
		mServiceListener.onServiceConnected(BluetoothProfile.INPUT_DEVICE,
		BluetoothInputDevice.this);
		mServiceListener.onServiceConnected(BluetoothProfile.HID_HOST,
		BluetoothHidHost.this);
		}
		}

		@@ -518,7 +518,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		if (DBG) Log.d(TAG, "Proxy object disconnected");
		mService = null;
		if (mServiceListener != null) {
		mServiceListener.onServiceDisconnected(BluetoothProfile.INPUT_DEVICE);
		mServiceListener.onServiceDisconnected(BluetoothProfile.HID_HOST);
		}
		}
		};
		@@ -542,7 +542,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean virtualUnplug(BluetoothDevice device) {
		if (DBG) log("virtualUnplug(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.virtualUnplug(device);
		@@ -568,7 +568,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean getProtocolMode(BluetoothDevice device) {
		if (VDBG) log("getProtocolMode(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getProtocolMode(device);
		@@ -592,7 +592,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean setProtocolMode(BluetoothDevice device, int protocolMode) {
		if (DBG) log("setProtocolMode(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.setProtocolMode(device, protocolMode);
		@@ -623,7 +623,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		log("getReport(" + device + "), reportType=" + reportType + " reportId=" + reportId
		+ "bufferSize=" + bufferSize);
		}
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getReport(device, reportType, reportId, bufferSize);
		@@ -649,7 +649,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean setReport(BluetoothDevice device, byte reportType, String report) {
		if (VDBG) log("setReport(" + device + "), reportType=" + reportType + " report=" + report);
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.setReport(device, reportType, report);
		@@ -674,7 +674,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean sendData(BluetoothDevice device, String report) {
		if (DBG) log("sendData(" + device + "), report=" + report);
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.sendData(device, report);
		@@ -698,7 +698,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean getIdleTime(BluetoothDevice device) {
		if (DBG) log("getIdletime(" + device + ")");
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.getIdleTime(device);
		@@ -723,7 +723,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		*/
		public boolean setIdleTime(BluetoothDevice device, byte idleTime) {
		if (DBG) log("setIdletime(" + device + "), idleTime=" + idleTime);
		final IBluetoothInputDevice service = mService;
		final IBluetoothHidHost service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		try {
		return service.setIdleTime(device, idleTime);

framework/java/android/bluetooth/BluetoothProfile.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -73,11 +73,11 @@ public interface BluetoothProfile {
		public static final int HEALTH = 3;

		/**
		* Input Device Profile
		* HID Host
		*
		* @hide
		*/
		public static final int INPUT_DEVICE = 4;
		public static final int HID_HOST = 4;

		/**
		* PAN Profile
		@@ -152,11 +152,11 @@ public interface BluetoothProfile {
		public static final int MAP_CLIENT = 18;

		/**
		* Input Host
		* HID Device
		*
		* @hide
		*/
		public static final int INPUT_HOST = 19;
		public static final int HID_DEVICE = 19;

		/**
		* Max profile ID. This value should be updated whenever a new profile is added to match

framework/tests/src/android/bluetooth/BluetoothStressTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -256,13 +256,13 @@ public class BluetoothStressTest extends InstrumentationTestCase {
		mTestUtils.unpair(mAdapter, device);
		mTestUtils.pair(mAdapter, device, BluetoothTestRunner.sDevicePairPasskey,
		BluetoothTestRunner.sDevicePairPin);
		mTestUtils.disconnectProfile(mAdapter, device, BluetoothProfile.INPUT_DEVICE, null);
		mTestUtils.disconnectProfile(mAdapter, device, BluetoothProfile.HID_HOST, null);

		for (int i = 0; i < iterations; i++) {
		mTestUtils.writeOutput("connectInput iteration " + (i + 1) + " of " + iterations);
		mTestUtils.connectProfile(mAdapter, device, BluetoothProfile.INPUT_DEVICE,
		mTestUtils.connectProfile(mAdapter, device, BluetoothProfile.HID_HOST,
		String.format("connectInput(device=%s)", device));
		mTestUtils.disconnectProfile(mAdapter, device, BluetoothProfile.INPUT_DEVICE,
		mTestUtils.disconnectProfile(mAdapter, device, BluetoothProfile.HID_HOST,
		String.format("disconnectInput(device=%s)", device));
		}