Snap for 4517567 from f593b0feb0740bb71c198989448a014091f1819f to pi-release (9c6b0378) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_hid_device.cpp

+3 −3

android/app/res/values-am/strings.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -132,4 +132,5 @@
	<string name="bluetooth_connected" msgid="6718623220072656906">"የብሉቱዝ ኦዲዮ ተገናኝቷል"</string>		<string name="bluetooth_connected" msgid="6718623220072656906">"የብሉቱዝ ኦዲዮ ተገናኝቷል"</string>
	<string name="bluetooth_disconnected" msgid="3318303728981478873">"የብሉቱዝ ኦዲዮ ግንኙነት ተቋርጧል"</string>		<string name="bluetooth_disconnected" msgid="3318303728981478873">"የብሉቱዝ ኦዲዮ ግንኙነት ተቋርጧል"</string>
	<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"የብሉቱዝ ኦዲዮ"</string>		<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"የብሉቱዝ ኦዲዮ"</string>
			<string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"ከ4 ጊባ በላይ የሆኑ ፋይሎች ሊዛወሩ አይችሉም"</string>
	</resources>		</resources>

android/app/res/values-be/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -136,5 +136,5 @@
	<string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-аўдыя падключана"</string>		<string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-аўдыя падключана"</string>
	<string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-аўдыя адключана"</string>		<string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-аўдыя адключана"</string>
	<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-аўдыя"</string>		<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-аўдыя"</string>
	<string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Немагчыма перавесці файлы большыя за 4 ГБ"</string>		<string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Немагчыма перадаць файлы, большыя за 4 ГБ"</string>
	</resources>		</resources>

android/app/res/values-en-rAU/strings.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -132,4 +132,5 @@
	<string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>		<string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>
	<string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>		<string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>
	<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>		<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
			<string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Files bigger than 4 GB cannot be transferred"</string>
	</resources>		</resources>

android/app/res/values-en-rCA/strings.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -132,4 +132,5 @@
	<string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>		<string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>
	<string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>		<string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>
	<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>		<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
			<string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Files bigger than 4 GB cannot be transferred"</string>
	</resources>		</resources>

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");
	}		}