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

Commit 6369c9e5 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

parents 3094ee65 4558086a

jni/com_android_bluetooth_hearing_aid.cpp

+0 −36
Original line number Diff line number Diff line
@@ -194,40 +194,6 @@ 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__
@@ -243,8 +209,6 @@ 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-af/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
    <string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"Verwyder uit lys"</string>

    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Vee uit"</string>

    <string name="bluetooth_a2dp_sink_queue_name" msgid="6864149958708669766">"Wat Speel"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Stoor"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Kanselleer"</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Kies die rekeninge wat jy deur Bluetooth wil deel. Jy moet steeds enige toegang tot die rekeninge aanvaar wanneer jy koppel."</string>

res/values-am/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
    <string name="transfer_menu_open" msgid="3368984869083107200">"ክፈት"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"ከዝርዝር አጽዳ"</string>

    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"አጽዳ"</string>

    <string name="bluetooth_a2dp_sink_queue_name" msgid="6864149958708669766">"አሁን እየተጫወተ ያለ"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"አስቀምጥ"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ይቅር"</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"በብሉቱዝ በኩል ማጋራት የሚፈልጓቸውን መለያዎች ይምረጡ። አሁንም በሚገናኙበት ወቅት ማንኛቸውም የመለያዎቹ መዳረሻ መፍቀድ አለብዎት።"</string>

res/values-ar/strings.xml

+2 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <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_line1" msgid="7203551583048149">"إلى لاستخدم خدمات البلوتوث، يجب أولاً تشغيل البلوتوث."</string>

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

    <string name="bt_enable_cancel" msgid="1988832367505151727">"إلغاء"</string>

    <string name="bt_enable_ok" msgid="3432462749994538265">"تشغيل"</string>
@@ -100,7 +100,7 @@ 
    <string name="status_connection_error" msgid="947681831523219891">"لم يتم الاتصال بنجاح."</string>

    <string name="status_protocol_error" msgid="3245444473429269539">"لا يمكن معالجة الطلب بشكل صحيح."</string>

    <string name="status_unknown_error" msgid="8156660554237824912">"خطأ غير معروف."</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"تم الاستلام عبر بلوتوث"</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"تم استلام بلوتوث"</string>

    <string name="opp_notification_group" msgid="3486303082135789982">"مشاركة البلوتوث"</string>

    <string name="download_success" msgid="7036160438766730871">"اكتمل استلام <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>

    <string name="upload_success" msgid="4014469387779648949">"اكتمل إرسال <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
@@ -130,7 +130,6 @@ 
    <string name="transfer_menu_open" msgid="3368984869083107200">"فتح"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"محو من القائمة"</string>

    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"محو"</string>

    <string name="bluetooth_a2dp_sink_queue_name" msgid="6864149958708669766">"اكتشاف الموسيقى"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"حفظ"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"إلغاء"</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"حدد الحسابات التي تريد مشاركتها عبر البلوتوث. لا يزال يتعين عليك قبول أي دخول إلى الحسابات أثناء الاتصال."</string>

res/values-az/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
    <string name="transfer_menu_open" msgid="3368984869083107200">"Açın"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"Siyahıdan silin"</string>

    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Silin"</string>

    <string name="bluetooth_a2dp_sink_queue_name" msgid="6864149958708669766">"İndi Efirdə"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Yadda saxlayın"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Ləğv edin"</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth vasitəsilə paylaşmaq istədiyiniz hesabları seçin. Qoşulma zamanı hesablara olan istənilən girişi qəbul etməlisiniz."</string>