Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (3/5)" am: 11f8139285 (881c0adc) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_hid_device.cpp

+3 −3

android/app/src/com/android/bluetooth/hid/HidDeviceNativeInterface.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -225,12 +225,12 @@ public class HidDeviceNativeInterface {
	}		}
	}		}

	private synchronized void onIntrData(byte reportId, byte[] data) {		private synchronized void onInterruptData(byte reportId, byte[] data) {
	HidDeviceService service = HidDeviceService.getHidDeviceService();		HidDeviceService service = HidDeviceService.getHidDeviceService();
	if (service != null) {		if (service != null) {
	service.onIntrDataFromNative(reportId, data);		service.onInterruptDataFromNative(reportId, data);
	} else {		} else {
	Log.wtfStack(TAG, "FATAL: onIntrData() "		Log.wtfStack(TAG, "FATAL: onInterruptData() "
	+ "is called from the stack while service is not available.");		+ "is called from the stack while service is not available.");
	}		}
	}		}

android/app/src/com/android/bluetooth/hid/HidDeviceService.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -198,7 +198,7 @@ public class HidDeviceService extends ProfileService {

	try {		try {
	if (mCallback != null) {		if (mCallback != null) {
	mCallback.onIntrData(mHidDevice, reportId, data);		mCallback.onInterruptData(mHidDevice, reportId, data);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	e.printStackTrace();		e.printStackTrace();
	@@ -687,9 +687,9 @@ public class HidDeviceService extends ProfileService {
	mHandler.sendMessage(msg);		mHandler.sendMessage(msg);
	}		}

	synchronized void onIntrDataFromNative(byte reportId, byte[] data) {		synchronized void onInterruptDataFromNative(byte reportId, byte[] data) {
	if (DBG) {		if (DBG) {
	Log.d(TAG, "onIntrData(): reportId=" + reportId);		Log.d(TAG, "onInterruptData(): reportId=" + reportId);
	}		}

	ByteBuffer bb = ByteBuffer.wrap(data);		ByteBuffer bb = ByteBuffer.wrap(data);

android/app/tests/unit/src/com/android/bluetooth/hid/HidDeviceTest.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -259,7 +259,7 @@ public class HidDeviceTest {
	}		}
	}		}

	public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) {		public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
	try {		try {
	mCallbackQueue.put(CALLBACK_ON_INTR_DATA);		mCallbackQueue.put(CALLBACK_ON_INTR_DATA);
	} catch (InterruptedException e) {		} catch (InterruptedException e) {
	@@ -492,7 +492,7 @@ public class HidDeviceTest {

	/**		/**
	* Test the logic in callback functions from native stack: onGetReport, onSetReport,		* Test the logic in callback functions from native stack: onGetReport, onSetReport,
	* onSetProtocol, onIntrData, onVirtualCableUnplug. The HID Device server should send the		* onSetProtocol, onInterruptData, onVirtualCableUnplug. The HID Device server should send the
	* callback to the user app.		* callback to the user app.
	*/		*/
	@Test		@Test
	@@ -529,8 +529,8 @@ public class HidDeviceTest {
	mHidDeviceService.onSetProtocolFromNative(BluetoothHidDevice.PROTOCOL_BOOT_MODE);		mHidDeviceService.onSetProtocolFromNative(BluetoothHidDevice.PROTOCOL_BOOT_MODE);
	verifyCallback(TIMEOUT_MS, CALLBACK_ON_SET_PROTOCOL, mCallbackQueue);		verifyCallback(TIMEOUT_MS, CALLBACK_ON_SET_PROTOCOL, mCallbackQueue);

	// Received callback: onIntrData		// Received callback: onInterruptData
	mHidDeviceService.onIntrDataFromNative(SAMPLE_REPORT_ID, SAMPLE_HID_REPORT);		mHidDeviceService.onInterruptDataFromNative(SAMPLE_REPORT_ID, SAMPLE_HID_REPORT);
	verifyCallback(TIMEOUT_MS, CALLBACK_ON_INTR_DATA, mCallbackQueue);		verifyCallback(TIMEOUT_MS, CALLBACK_ON_INTR_DATA, mCallbackQueue);

	// Received callback: onVirtualCableUnplug		// Received callback: onVirtualCableUnplug

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ static jmethodID method_onConnectStateChanged;
	static jmethodID method_onGetReport;		static jmethodID method_onGetReport;
	static jmethodID method_onSetReport;		static jmethodID method_onSetReport;
	static jmethodID method_onSetProtocol;		static jmethodID method_onSetProtocol;
	static jmethodID method_onIntrData;		static jmethodID method_onInterruptData;
	static jmethodID method_onVirtualCableUnplug;		static jmethodID method_onVirtualCableUnplug;

	static const bthd_interface_t* sHiddIf = NULL;		static const bthd_interface_t* sHiddIf = NULL;
	@@ -132,7 +132,7 @@ static void intr_data_callback(uint8_t report_id, uint16_t len,
	}		}
	sCallbackEnv->SetByteArrayRegion(data.get(), 0, len, (jbyte*)p_data);		sCallbackEnv->SetByteArrayRegion(data.get(), 0, len, (jbyte*)p_data);

	sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onIntrData,		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onInterruptData,
	(jbyte)report_id, data.get());		(jbyte)report_id, data.get());
	}		}

	@@ -163,7 +163,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
	method_onGetReport = env->GetMethodID(clazz, "onGetReport", "(BBS)V");		method_onGetReport = env->GetMethodID(clazz, "onGetReport", "(BBS)V");
	method_onSetReport = env->GetMethodID(clazz, "onSetReport", "(BB[B)V");		method_onSetReport = env->GetMethodID(clazz, "onSetReport", "(BB[B)V");
	method_onSetProtocol = env->GetMethodID(clazz, "onSetProtocol", "(B)V");		method_onSetProtocol = env->GetMethodID(clazz, "onSetProtocol", "(B)V");
	method_onIntrData = env->GetMethodID(clazz, "onIntrData", "(B[B)V");		method_onInterruptData = env->GetMethodID(clazz, "onInterruptData", "(B[B)V");
	method_onVirtualCableUnplug =		method_onVirtualCableUnplug =
	env->GetMethodID(clazz, "onVirtualCableUnplug", "()V");		env->GetMethodID(clazz, "onVirtualCableUnplug", "()V");
	}		}