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

Commit 4630db4b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10884398 from 59adaf5d to udc-qpr1-release 

Change-Id: I0f637a54199569fc3b65c3265cded19ed37ffc8b
parents 0c051ab7 59adaf5d

cmds/incidentd/src/IncidentService.cpp

+12 −8
Original line number Diff line number Diff line
@@ -502,9 +502,13 @@ status_t IncidentService::onTransact(uint32_t code, const Parcel& data, Parcel* 


    switch (code) {

        case SHELL_COMMAND_TRANSACTION: {

            int in = data.readFileDescriptor();

            int out = data.readFileDescriptor();

            int err = data.readFileDescriptor();

            unique_fd in, out, err;

            if (status_t status = data.readUniqueFileDescriptor(&in); status != OK) return status;



            if (status_t status = data.readUniqueFileDescriptor(&out); status != OK) return status;



            if (status_t status = data.readUniqueFileDescriptor(&err); status != OK) return status;



            int argc = data.readInt32();

            Vector<String8> args;

            for (int i = 0; i < argc && data.dataAvail() > 0; i++) {
@@ -514,15 +518,15 @@ status_t IncidentService::onTransact(uint32_t code, const Parcel& data, Parcel* 
            sp<IResultReceiver> resultReceiver =

                    IResultReceiver::asInterface(data.readStrongBinder());



            FILE* fin = fdopen(in, "r");

            FILE* fout = fdopen(out, "w");

            FILE* ferr = fdopen(err, "w");

            FILE* fin = fdopen(in.release(), "r");

            FILE* fout = fdopen(out.release(), "w");

            FILE* ferr = fdopen(err.release(), "w");



            if (fin == NULL || fout == NULL || ferr == NULL) {

                resultReceiver->send(NO_MEMORY);

            } else {

                err = command(fin, fout, ferr, args);

                resultReceiver->send(err);

                status_t result = command(fin, fout, ferr, args);

                resultReceiver->send(result);

            }



            if (fin != NULL) {

core/java/android/hardware/radio/ProgramSelector.java

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ public final class ProgramSelector implements Parcelable { 
     *

     * <p>Consists of (from the LSB):

     * <li>

     *     <ul>132bit: Station ID number.

     *     <ul>14bit: HD_SUBCHANNEL.

     *     <ul>32bit: Station ID number.

     *     <ul>4bit: HD_SUBCHANNEL.

     *     <ul>18bit: AMFM_FREQUENCY.

     * </li>

     *

core/res/res/values-eu/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ 
    <string name="keyboardview_keycode_shift" msgid="3026509237043975573">"Maius"</string>

    <string name="keyboardview_keycode_enter" msgid="168054869339091055">"Sartu"</string>

    <string name="activitychooserview_choose_application" msgid="3500574466367891463">"Aukeratu aplikazio bat"</string>

    <string name="activitychooserview_choose_application_error" msgid="6937782107559241734">"Ezin izan da <xliff:g id="APPLICATION_NAME">%s</xliff:g> abiarazi"</string>

    <string name="activitychooserview_choose_application_error" msgid="6937782107559241734">"Ezin izan da exekutatu <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>

    <string name="shareactionprovider_share_with" msgid="2753089758467748982">"Partekatu hauekin"</string>

    <string name="shareactionprovider_share_with_application" msgid="4902832247173666973">"Partekatu <xliff:g id="APPLICATION_NAME">%s</xliff:g> aplikazioarekin"</string>

    <string name="content_description_sliding_handle" msgid="982510275422590757">"Lerratze-euskarria. Ukitu eta eutsi."</string>
@@ -1613,7 +1613,7 @@ 
    <string name="activity_chooser_view_dialog_title_default" msgid="8880731437191978314">"Aukeratu jarduera"</string>

    <string name="share_action_provider_share_with" msgid="1904096863622941880">"Partekatu hauekin:"</string>

    <string name="sending" msgid="206925243621664438">"Bidaltzen…"</string>

    <string name="launchBrowserDefault" msgid="6328349989932924119">"Arakatzailea abiarazi nahi duzu?"</string>

    <string name="launchBrowserDefault" msgid="6328349989932924119">"Arakatzailea exekutatu nahi duzu?"</string>

    <string name="SetupCallDefault" msgid="5581740063237175247">"Deia onartu nahi duzu?"</string>

    <string name="activity_resolver_use_always" msgid="5575222334666843269">"Beti"</string>

    <string name="activity_resolver_use_once" msgid="948462794469672658">"Behin soilik"</string>

core/res/res/values-fa/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -2335,10 +2335,10 @@ 
    <string name="device_state_notification_settings_button" msgid="691937505741872749">"رفتن به تنظیمات"</string>

    <string name="device_state_notification_turn_off_button" msgid="6327161707661689232">"خاموش کردن"</string>

    <string name="keyboard_layout_notification_selected_title" msgid="1202560174252421219">"‫<xliff:g id="DEVICE_NAME">%s</xliff:g> پیکربندی شد"</string>

    <string name="keyboard_layout_notification_one_selected_message" msgid="4314216053129257197">"طرح‌بندی صفحه‌کلید روی <xliff:g id="LAYOUT_1">%s</xliff:g> تنظیم شد. برای تغییر دادن، ضربه بزنید."</string>

    <string name="keyboard_layout_notification_two_selected_message" msgid="1876349944065922950">"طرح‌بندی صفحه‌کلید روی <xliff:g id="LAYOUT_1">%1$s</xliff:g>، <xliff:g id="LAYOUT_2">%2$s</xliff:g> تنظیم شد. برای تغییر دادن، ضربه بزنید."</string>

    <string name="keyboard_layout_notification_three_selected_message" msgid="280734264593115419">"طرح‌بندی صفحه‌کلید روی <xliff:g id="LAYOUT_1">%1$s</xliff:g>، <xliff:g id="LAYOUT_2">%2$s</xliff:g>، <xliff:g id="LAYOUT_3">%3$s</xliff:g> تنظیم شد. برای تغییر دادن، ضربه بزنید."</string>

    <string name="keyboard_layout_notification_more_than_three_selected_message" msgid="1581834181578206937">"صفحه‌کلید روی این طرح‌بندی‌ها تنظیم شد: <xliff:g id="LAYOUT_1">%1$s</xliff:g>، <xliff:g id="LAYOUT_2">%2$s</xliff:g>، <xliff:g id="LAYOUT_3">%3$s</xliff:g>… برای تغییر ضربه بزنید"</string>

    <string name="keyboard_layout_notification_one_selected_message" msgid="4314216053129257197">"جانمایی صفحه‌کلید روی <xliff:g id="LAYOUT_1">%s</xliff:g> تنظیم شد. برای تغییر دادن، ضربه بزنید."</string>

    <string name="keyboard_layout_notification_two_selected_message" msgid="1876349944065922950">"جانمایی صفحه‌کلید روی <xliff:g id="LAYOUT_1">%1$s</xliff:g>، <xliff:g id="LAYOUT_2">%2$s</xliff:g> تنظیم شد. برای تغییر دادن، ضربه بزنید."</string>

    <string name="keyboard_layout_notification_three_selected_message" msgid="280734264593115419">"جانمایی صفحه‌کلید روی <xliff:g id="LAYOUT_1">%1$s</xliff:g>، <xliff:g id="LAYOUT_2">%2$s</xliff:g>، <xliff:g id="LAYOUT_3">%3$s</xliff:g> تنظیم شد. برای تغییر دادن، ضربه بزنید."</string>

    <string name="keyboard_layout_notification_more_than_three_selected_message" msgid="1581834181578206937">"جانمایی صفحه‌کلید چنین تنظیم شد: <xliff:g id="LAYOUT_1">%1$s</xliff:g>، <xliff:g id="LAYOUT_2">%2$s</xliff:g>، <xliff:g id="LAYOUT_3">%3$s</xliff:g>… برای تغییر ضربه بزنید"</string>

    <string name="keyboard_layout_notification_multiple_selected_title" msgid="5242444914367024499">"صفحه‌کلیدهای فیزیکی پیکربندی شدند"</string>

    <string name="keyboard_layout_notification_multiple_selected_message" msgid="6576533454124419202">"برای مشاهده صفحه‌کلیدها ضربه بزنید"</string>

</resources>

core/res/res/values-ko/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ 
    <string name="usb_power_notification_message" msgid="7284765627437897702">"연결된 기기를 충전합니다. 옵션을 더 보려면 탭하세요."</string>

    <string name="usb_unsupported_audio_accessory_title" msgid="2335775548086533065">"아날로그 오디오 액세서리가 감지됨"</string>

    <string name="usb_unsupported_audio_accessory_message" msgid="1300168007129796621">"연결된 기기가 이 휴대전화와 호환되지 않습니다. 자세히 알아보려면 탭하세요."</string>

    <string name="adb_active_notification_title" msgid="408390247354560331">"USB 디버깅 연결됨."</string>

    <string name="adb_active_notification_title" msgid="408390247354560331">"USB 디버깅 연결됨"</string>

    <string name="adb_active_notification_message" msgid="5617264033476778211">"USB 디버깅을 사용 중지하려면 탭하세요."</string>

    <string name="adb_active_notification_message" product="tv" msgid="6624498401272780855">"USB 디버깅을 사용하지 않으려면 선택합니다."</string>

    <string name="adbwifi_active_notification_title" msgid="6147343659168302473">"무선 디버깅 연결됨"</string>