Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32b299a3 authored by Xin Li's avatar Xin Li
Browse files

Merge redfin/bramble support. 

Bug: 171218636
Merged-In: I9e19972d433064adc527b014822449996dd09752
Change-Id: If54203d20c305271ce1eccce91d0ef4f7cae8f39
parents 89f86c00 e0788397

jni/com_android_bluetooth_btservice_AdapterService.cpp

+4 −3
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 


static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,

                       jboolean isNiapMode, int configCompareResult,

                       jobjectArray initFlags) {

                       jobjectArray initFlags, jboolean isAtvDevice) {

  ALOGV("%s", __func__);



  android_bluetooth_UidTraffic.clazz =
@@ -711,7 +711,8 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, 


  int ret = sBluetoothInterface->init(

      &sBluetoothCallbacks, isGuest == JNI_TRUE ? 1 : 0,

      isNiapMode == JNI_TRUE ? 1 : 0, configCompareResult, flags);

      isNiapMode == JNI_TRUE ? 1 : 0, configCompareResult, flags,

      isAtvDevice == JNI_TRUE ? 1 : 0);



  for (int i = 0; i < flagCount; i++) {

    env->ReleaseStringUTFChars(flagObjs[i], flags[i]);
@@ -1335,7 +1336,7 @@ static int getMetricIdNative(JNIEnv* env, jobject obj, jbyteArray address) { 
static JNINativeMethod sMethods[] = {

    /* name, signature, funcPtr */

    {"classInitNative", "()V", (void*)classInitNative},

    {"initNative", "(ZZI[Ljava/lang/String;)Z", (void*)initNative},

    {"initNative", "(ZZI[Ljava/lang/String;Z)Z", (void*)initNative},

    {"cleanupNative", "()V", (void*)cleanupNative},

    {"enableNative", "()Z", (void*)enableNative},

    {"disableNative", "()Z", (void*)disableNative},

res/values-ar/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    <string name="bt_share_picker_label" msgid="6268100924487046932">"بلوتوث"</string>

    <string name="unknown_device" msgid="9221903979877041009">"جهاز غير معروف"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"غير معروف"</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"وضع الطائرة"</string>

    <string name="airplane_error_msg" msgid="8698965595254137230">"لا يمكنك استخدام البلوتوث في وضع الطائرة."</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"وضع الطيران"</string>

    <string name="airplane_error_msg" msgid="8698965595254137230">"لا يمكنك استخدام البلوتوث في وضع الطيران."</string>

    <string name="bt_enable_title" msgid="8657832550503456572"></string>

    <string name="bt_enable_line1" msgid="7203551583048149">"لإستخدام خدمات البلوتوث، يجب تفعيل البلوتوث أولاً."</string>

    <string name="bt_enable_line2" msgid="4341936569415937994">"هل تريد تفعيل البلوتوث الآن؟"</string>

res/values-de/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Auf Download-Manager zugreifen"</string>

    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Ermöglicht der App, auf den Bluetooth-Weiterleitungs-Manager zuzugreifen und diesen für die Übertragung von Dateien zu verwenden."</string>

    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth-Gerät für Zugriff zur weißen Liste hinzufügen"</string>

    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Ermöglicht der App, ein Bluetooth-Gerät vorübergehend zur weißen Liste hinzuzufügen, sodass es ohne Bestätigung des Nutzers Dateien an dieses Gerät senden kann"</string>

    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth-Gerät für Zugriff zur Zulassungsliste hinzufügen"</string>

    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Ermöglicht der App, ein Bluetooth-Gerät vorübergehend zur Zulassungsliste hinzuzufügen, sodass es ohne Bestätigung des Nutzers Dateien an dieses Gerät senden kann"</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Unbekanntes Gerät"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Unbekannter Anrufer"</string>

res/values-fa/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"نپذیرفتن"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"پذیرفتن"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"تأیید"</string>

    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" وقفه زمانی پیش آمد"</string>

    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" درنگ پیش آمد"</string>

    <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"فایل ورودی"</string>

    <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> آماده ارسال <xliff:g id="FILE">%2$s</xliff:g> است"</string>

    <string name="notification_receiving" msgid="4674648179652543984">"اشتراک بلوتوث: در حال دریافت <xliff:g id="FILE">%1$s</xliff:g>"</string>

res/values-hy/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
    <string name="download_fail_line1" msgid="3846450148862894552">"Ֆայլը չհաջողվեց ստանալ"</string>

    <string name="download_fail_line2" msgid="8950394574689971071">"Ֆայլ՝ <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_fail_line3" msgid="3451040656154861722">"Պատճառը՝ <xliff:g id="REASON">%1$s</xliff:g>"</string>

    <string name="download_fail_ok" msgid="1521733664438320300">"Հաստատել"</string>

    <string name="download_fail_ok" msgid="1521733664438320300">"Եղավ"</string>

    <string name="download_succ_line5" msgid="4509944688281573595">"Ֆայլը ստացվել է"</string>

    <string name="download_succ_ok" msgid="7053688246357050216">"Բացել"</string>

    <string name="upload_line1" msgid="2055952074059709052">"Ում՝ «<xliff:g id="RECIPIENT">%1$s</xliff:g>»"</string>