Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" (8438a3a0) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothHidDevice.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ public final class BluetoothHidDevice implements BluetoothProfile {
		*
		* @see BluetoothHidDeviceCallback#onGetReport(BluetoothDevice, byte, byte, int)
		* @see BluetoothHidDeviceCallback#onSetReport(BluetoothDevice, byte, byte, byte[])
		* @see BluetoothHidDeviceCallback#onIntrData(BluetoothDevice, byte, byte[])
		* @see BluetoothHidDeviceCallback#onInterruptData(BluetoothDevice, byte, byte[])
		*/
		public static final byte REPORT_TYPE_INPUT = (byte) 1;
		public static final byte REPORT_TYPE_OUTPUT = (byte) 2;
		@@ -155,8 +155,8 @@ public final class BluetoothHidDevice implements BluetoothProfile {
		}

		@Override
		public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) {
		mCallback.onIntrData(device, reportId, data);
		public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
		mCallback.onInterruptData(device, reportId, data);
		}

		@Override

+2 −2

Original line number	Diff line number	Diff line
		@@ -106,8 +106,8 @@ public abstract class BluetoothHidDeviceCallback {
		* @param reportId Report Id.
		* @param data Report data.
		*/
		public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) {
		Log.d(TAG, "onIntrData: device=" + device + " reportId=" + reportId);
		public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
		Log.d(TAG, "onInterruptData: device=" + device + " reportId=" + reportId);
		}

		/**