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

Commit be939bbe authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release am: 04c46f7b" into pie-gsi

parents 3e191ef4 5f5508ce

res/values-ar/strings.xml

+1 −1
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>

res/values-fa/strings_pbap.xml

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

    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"‏تایپ کلید جلسه برای %1$s"</string>

    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"به کلید جلسه بلوتوث نیاز است"</string>

    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"‏هنگام پذیرش اتصال به %1$s وقفه زمانی ایجاد شده است"</string>

    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"‏هنگام ورود کلید جلسه با %1$s وقفه زمانی ایجاد شده است"</string>

    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"‏پذیرش اتصال با %1$s خیلی زمان برد"</string>

    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"‏وارد کردن کلید جلسه با %1$s خیلی زمان برد"</string>

    <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست احراز هویت Obex"</string>

    <string name="auth_notif_title" msgid="7599854855681573258">"کلید جلسه"</string>

    <string name="auth_notif_message" msgid="6667218116427605038">"‏تایپ کلید جلسه برای %1$s"</string>

res/values-pl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    <string name="not_exist_file_desc" msgid="4059531573790529229">"Plik nie istnieje. \n"</string>

    <string name="enabling_progress_title" msgid="436157952334723406">"Czekaj…"</string>

    <string name="enabling_progress_content" msgid="4601542238119927904">"Włączanie Bluetooth…"</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Plik zostanie odebrany. Sprawdzaj postęp na panelu powiadomień."</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Plik zostanie odebrany. Sprawdzaj postęp w panelu powiadomień."</string>

    <string name="bt_toast_2" msgid="8602553334099066582">"Nie można odebrać pliku."</string>

    <string name="bt_toast_3" msgid="6707884165086862518">"Zatrzymano odbiór pliku z urządzenia „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>

    <string name="bt_toast_4" msgid="4678812947604395649">"Wysyłanie pliku do urządzenia „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>

res/values-pt/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Limpar"</string>

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

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

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecione as contas que você deseja compartilhar via Bluetooth. Você ainda precisa aceitar qualquer acesso às contas ao se conectar."</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecione as contas que você quer compartilhar via Bluetooth. Você ainda precisa aceitar qualquer acesso às contas ao se conectar."</string>

    <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Espaços disponíveis:"</string>

    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ícone do app"</string>

    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Configurações de compartilhamento de mensagens Bluetooth"</string>

src/com/android/bluetooth/a2dp/A2dpService.java

+11 −0
Original line number Diff line number Diff line
@@ -517,7 +517,14 @@ public class A2dpService extends ProfileService { 
                }

                // Make sure the Audio Manager knows the previous Active device is disconnected,

                // and the new Active device is connected.

                // Also, mute and unmute the output during the switch to avoid audio glitches.

                boolean wasMuted = false;

                if (previousActiveDevice != null) {

                    if (!mAudioManager.isStreamMute(AudioManager.STREAM_MUSIC)) {

                        mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,

                                                         AudioManager.ADJUST_MUTE, 0);

                        wasMuted = true;

                    }

                    mAudioManager.setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(

                            previousActiveDevice, BluetoothProfile.STATE_DISCONNECTED,

                            BluetoothProfile.A2DP, true, -1);
@@ -539,6 +546,10 @@ public class A2dpService extends ProfileService { 
                // change, so the Audio Service can reset accordingly the audio

                // feeding parameters in the Audio HAL to the Bluetooth stack.

                mAudioManager.handleBluetoothA2dpDeviceConfigChange(mActiveDevice);

                if (wasMuted) {

                    mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,

                                                     AudioManager.ADJUST_UNMUTE, 0);

                }

            }

        }

        return true;