Merge "Snap for 5180536 from eb3399e34da5a7514f2468402543cb7d5aabc362 to... (5af1dd16) · Commits · e / os / android_packages_apps_Bluetooth

AndroidManifest.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -393,8 +393,7 @@
		</service>
		<service
		android:process="@string/process"
		android:name = ".hearingaid.HearingAidService"
		android:enabled="@bool/profile_supported_hearing_aid">
		android:name = ".hearingaid.HearingAidService">
		<intent-filter>
		<action android:name="android.bluetooth.IBluetoothHearingAid" />
		</intent-filter>

jni/com_android_bluetooth_hearing_aid.cpp

+36 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,40 @@ static jboolean disconnectHearingAidNative(JNIEnv* env, jobject object,
		return JNI_TRUE;
		}

		static jboolean addToWhiteListNative(JNIEnv* env, jobject object,
		jbyteArray address) {
		std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);
		if (!sHearingAidInterface) return JNI_FALSE;

		jbyte* addr = env->GetByteArrayElements(address, nullptr);
		if (!addr) {
		jniThrowIOException(env, EINVAL);
		return JNI_FALSE;
		}

		RawAddress* tmpraw = (RawAddress*)addr;
		sHearingAidInterface->AddToWhiteList(*tmpraw);
		env->ReleaseByteArrayElements(address, addr, 0);
		return JNI_TRUE;
		}

		static jboolean removeFromWhiteListNative(JNIEnv* env, jobject object,
		jbyteArray address) {
		std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);
		if (!sHearingAidInterface) return JNI_FALSE;

		jbyte* addr = env->GetByteArrayElements(address, nullptr);
		if (!addr) {
		jniThrowIOException(env, EINVAL);
		return JNI_FALSE;
		}

		RawAddress* tmpraw = (RawAddress*)addr;
		sHearingAidInterface->RemoveFromWhiteList(*tmpraw);
		env->ReleaseByteArrayElements(address, addr, 0);
		return JNI_TRUE;
		}

		static void setVolumeNative(JNIEnv* env, jclass clazz, jint volume) {
		if (!sHearingAidInterface) {
		LOG(ERROR) << __func__
		@@ -209,6 +243,8 @@ static JNINativeMethod sMethods[] = {
		{"cleanupNative", "()V", (void*)cleanupNative},
		{"connectHearingAidNative", "([B)Z", (void*)connectHearingAidNative},
		{"disconnectHearingAidNative", "([B)Z", (void*)disconnectHearingAidNative},
		{"addToWhiteListNative", "([B)Z", (void*)addToWhiteListNative},
		{"removeFromWhiteListNative", "([B)Z", (void*)removeFromWhiteListNative},
		{"setVolumeNative", "(I)V", (void*)setVolumeNative},
		};

res/values-ca/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@
		<string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviat"</string>
		<string name="notification_sent_complete" msgid="302943281067557969">"100% complet"</string>
		<string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> no enviat"</string>
		<string name="download_title" msgid="3353228219772092586">"Transferència del fitxer"</string>
		<string name="download_title" msgid="3353228219772092586">"Transferència de fitxers"</string>
		<string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
		<string name="download_line2" msgid="5876973543019417712">"Fitxer: <xliff:g id="FILE">%1$s</xliff:g>"</string>
		<string name="download_line3" msgid="4384821622908676061">"Mida del fitxer: <xliff:g id="SIZE">%1$s</xliff:g>"</string>

res/values-de/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@
		<string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Der USB-Speicher verfügt nicht über genügend Speicherplatz, um die Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" zu speichern."</string>
		<string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Die SD-Karte verfügt über zu wenig Speicherplatz für die Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\"."</string>
		<string name="bt_sm_2_2" msgid="2965243265852680543">"Erforderlicher Speicherplatz: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
		<string name="ErrorTooManyRequests" msgid="8578277541472944529">"Es werden zurzeit zu viele Anfragen verarbeitet. Versuche es später erneut."</string>
		<string name="ErrorTooManyRequests" msgid="8578277541472944529">"Es werden zurzeit zu viele Anfragen verarbeitet. Bitte versuche es später noch einmal."</string>
		<string name="status_pending" msgid="2503691772030877944">"Die Dateiübertragung wurde noch nicht gestartet."</string>
		<string name="status_running" msgid="6562808920311008696">"Dateiübertragung läuft."</string>
		<string name="status_success" msgid="239573225847565868">"Die Dateiübertragung wurde abgeschlossen."</string>

res/values-iw/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@
		<string name="not_exist_file_desc" msgid="4059531573790529229">"הקובץ לא קיים. \n"</string>
		<string name="enabling_progress_title" msgid="436157952334723406">"המתן..."</string>
		<string name="enabling_progress_content" msgid="4601542238119927904">"‏מפעיל Bluetooth…"</string>
		<string name="bt_toast_1" msgid="972182708034353383">"הקובץ יתקבל. בדוק את ההתקדמות בחלונית \'הודעות\'."</string>
		<string name="bt_toast_1" msgid="972182708034353383">"הקובץ יתקבל. יש לבדוק את ההתקדמות בלוח ההתראות."</string>
		<string name="bt_toast_2" msgid="8602553334099066582">"לא ניתן לקבל את הקובץ."</string>
		<string name="bt_toast_3" msgid="6707884165086862518">"הופסקה קבלת קובץ מאת \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
		<string name="bt_toast_4" msgid="4678812947604395649">"שולח קובץ אל \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>