Snap for 5044688 from 891ca8c8309a4b7e4c77ff84f6172f69e8102089 to pi-qpr2-release (c50971ce) · Commits · e / os / android_packages_apps_Bluetooth

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-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>

res/values-uz/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@
		<string name="download_line4" msgid="8535996869722666525"></string>
		<string name="download_line5" msgid="3069560415845295386">"Fayl qabul qilinmoqda…"</string>
		<string name="download_cancel" msgid="9177305996747500768">"To‘xtatish"</string>
		<string name="download_ok" msgid="5000360731674466039">"Yashirish"</string>
		<string name="download_ok" msgid="5000360731674466039">"Berkitish"</string>
		<string name="incoming_line1" msgid="2127419875681087545">"Kimdan"</string>
		<string name="incoming_line2" msgid="3348994249285315873">"Fayl nomi"</string>
		<string name="incoming_line3" msgid="7954237069667474024">"Hajmi"</string>

src/com/android/bluetooth/btservice/Config.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.Resources;
		import android.provider.Settings;
		import android.util.FeatureFlagUtils;
		import android.util.Log;

		import com.android.bluetooth.R;
		@@ -117,6 +118,13 @@ public class Config {
		ArrayList<Class> profiles = new ArrayList<>(PROFILE_SERVICES_AND_FLAGS.length);
		for (ProfileConfig config : PROFILE_SERVICES_AND_FLAGS) {
		boolean supported = resources.getBoolean(config.mSupported);

		if (supported && (config.mClass == HearingAidService.class) && !FeatureFlagUtils
		.isEnabled(ctx, FeatureFlagUtils.HEARING_AID_SETTINGS)) {
		Log.v(TAG, "Feature Flag disables support for HearingAidService");
		supported = false;
		}

		if (supported && !isProfileDisabled(ctx, config.mMask)) {
		Log.v(TAG, "Adding " + config.mClass.getSimpleName());
		profiles.add(config.mClass);