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

Commit 6bd5c731 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4722539 from c8d6b602 to pi-release 

Change-Id: I844f0a4914be4dfed1238659814bab8b3db9309e
parents 0242bdef c8d6b602

android/app/jni/com_android_bluetooth_gatt.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1402,10 +1402,12 @@ static void gattConnectionParameterUpdateNative(JNIEnv* env, jobject object, 
                                                jint client_if, jstring address,

                                                jint min_interval,

                                                jint max_interval, jint latency,

                                                jint timeout) {

                                                jint timeout, jint min_ce_len,

                                                jint max_ce_len) {

  if (!sGattIf) return;

  sGattIf->client->conn_parameter_update(str2addr(env, address), min_interval,

                                         max_interval, latency, timeout);

  sGattIf->client->conn_parameter_update(

      str2addr(env, address), min_interval, max_interval, latency, timeout,

      (uint16_t)min_ce_len, (uint16_t)max_ce_len);

}



void batchscan_cfg_storage_cb(uint8_t client_if, uint8_t status) {
@@ -2168,7 +2170,7 @@ static JNINativeMethod sMethods[] = { 
     (void*)gattClientReadRemoteRssiNative},

    {"gattClientConfigureMTUNative", "(II)V",

     (void*)gattClientConfigureMTUNative},

    {"gattConnectionParameterUpdateNative", "(ILjava/lang/String;IIII)V",

    {"gattConnectionParameterUpdateNative", "(ILjava/lang/String;IIIIII)V",

     (void*)gattConnectionParameterUpdateNative},

    {"gattServerRegisterAppNative", "(JJ)V",

     (void*)gattServerRegisterAppNative},

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

+1 −1
Original line number Diff line number Diff line
@@ -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">"Bluetooth-ը ստացված է"</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"Ստացված է Bluetooth-ով"</string>

    <string name="opp_notification_group" msgid="3486303082135789982">"Bluetooth համօգտագործում"</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>

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

+1 −1
Original line number Diff line number Diff line
@@ -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">"Примен Bluetooth"</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"Прием од Bluetooth"</string>

    <string name="opp_notification_group" msgid="3486303082135789982">"Споделено преку Bluetooth"</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>

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

+5 −5
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>
@@ -84,8 +84,8 @@ 
    <string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" ना फाइल पाठवित आहे"</string>

    <string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" ना <xliff:g id="NUMBER">%1$s</xliff:g> फायली पाठवित आहे"</string>

    <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" ना फाइल पाठविणे थांबविले"</string>

    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" कडील फाइल जतन करण्‍यासाठी USB संचयनात पुरेसे स्‍थान नाही"</string>

    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" कडील फाइल जतन करण्‍यासाठी SD कार्डवर पुरेसे स्‍थान नाही"</string>

    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" कडील फाइल सेव्ह करण्‍यासाठी USB संचयनात पुरेसे स्‍थान नाही"</string>

    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" कडील फाइल सेव्ह करण्‍यासाठी SD कार्डवर पुरेसे स्‍थान नाही"</string>

    <string name="bt_sm_2_2" msgid="2965243265852680543">"स्‍थान आवश्यक: <xliff:g id="SIZE">%1$s</xliff:g>"</string>

    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"बर्‍याच विनंत्यांवर प्रक्रिया होत आहे. नंतर पुन्हा प्रयत्न करा."</string>

    <string name="status_pending" msgid="2503691772030877944">"फाइल स्थानांतरणाचा अद्याप प्रारंभ झाला नाही."</string>
@@ -96,7 +96,7 @@ 
    <string name="status_canceled" msgid="6664490318773098285">"वापरकर्त्याने स्‍थानांतरण रद्द केले."</string>

    <string name="status_file_error" msgid="3671917770630165299">"संचयन समस्‍या."</string>

    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"USB स्टोरेज नाही."</string>

    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"SD कार्ड नाही. स्‍थानांतरित केलेल्‍या फायली जतन करण्‍यासाठी SD कार्ड घाला."</string>

    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"SD कार्ड नाही. स्‍थानांतरित केलेल्‍या फायली सेव्ह करण्‍यासाठी SD कार्ड घाला."</string>

    <string name="status_connection_error" msgid="947681831523219891">"कनेक्‍शन अयशस्‍वी."</string>

    <string name="status_protocol_error" msgid="3245444473429269539">"विनंती योग्य रीतीने हाताळली जाऊ शकत नाही."</string>

    <string name="status_unknown_error" msgid="8156660554237824912">"अज्ञात एरर"</string>
@@ -106,7 +106,7 @@ 
    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> पाठविणे पूर्ण."</string>

    <string name="inbound_history_title" msgid="6940914942271327563">"इनबाउंड स्‍थानांतरणे"</string>

    <string name="outbound_history_title" msgid="4279418703178140526">"आउटबाउंड स्‍थानांतरणे"</string>

    <string name="no_transfers" msgid="3482965619151865672">"स्‍थानांतरण इतिहास रिक्त आहे."</string>

    <string name="no_transfers" msgid="3482965619151865672">"ट्रांसफर इतिहास रिक्त आहे."</string>

    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"सूचीमधून सर्व आयटम साफ केले जातील."</string>

    <string name="outbound_noti_title" msgid="8051906709452260849">"ब्लूटूथ शेअर: पाठवलेल्या फायली"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"ब्लूटूथ शेअर: मिळवलेल्‍या फायली"</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"အက်ပ်အား ဘလူးတုသ်စက်ကို ယာယီခွင့်ပြုစာရင်းထဲ ထည့်ရန်ခွင့်ပြုကာ အသုံးပြုသူ၏ အတည်ပြုချက်မရယူပဲ ဖိုင်များကို စက်ထဲသို့ ပို့ခွင့်ပြုမည်"</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"ဘလူးတုသ်"</string>

    <string name="unknown_device" msgid="9221903979877041009">"မသိသော စက်"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"အကြောင်းအရာ မသိရှိ"</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="bt_enable_title" msgid="8657832550503456572"></string>
@@ -106,7 +106,7 @@ 
    <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ပို့ခြင်း ပြီးဆုံးပြီး"</string>

    <string name="inbound_history_title" msgid="6940914942271327563">"ပြန်လည်ရောက်လာသော လွှဲမှုများ"</string>

    <string name="outbound_history_title" msgid="4279418703178140526">"ပြန်လည်ထွက်မည့် လွှဲမှုများ"</string>

    <string name="no_transfers" msgid="3482965619151865672">"လွဲပြောင်းခြင်း မှတ်တမ်းတွင် ဘာမှမရှိပါ"</string>

    <string name="no_transfers" msgid="3482965619151865672">"လွဲပြောင်းခြင်း မှတ်တမ်းတွင် ဘာမျှမရှိပါ"</string>

    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"အရာများအားလုံး စာရင်းမှ ရှင်းလင်းပစ်လိမ့်မည်"</string>

    <string name="outbound_noti_title" msgid="8051906709452260849">"ဘလူးတုသ် ဝေမျှမှု - ဖိုင်ပို့ပြီး"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"ဘလူးတုသ် ဝေမျှမှု - ရရှိပြီးဖိုင်များ"</string>