diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 09:36:15 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 09:36:15 +0000 |
commit | e271dd149c2817b2d59d95c6d9e191c52ea05900 (patch) | |
tree | a54a3d1f2fcc4bc9340b9babc8c828021480d716 | |
parent | 1dcc2f964e44de496a3917b36858c8adf17139af (diff) | |
parent | 88ca646d3b4a27ef9932690535c357a4f094fea0 (diff) | |
download | Telecomm-aml_tz5_341510010.tar.gz |
Snap for 11224086 from 88ca646d3b4a27ef9932690535c357a4f094fea0 to mainline-tzdata5-releaseaml_tz5_341510050aml_tz5_341510010aml_tz5_341510010
Change-Id: Ib6196d0379cc4b014c4673b21bf461e7012022c7
-rw-r--r-- | res/values-am/strings.xml | 2 | ||||
-rw-r--r-- | res/values-da/strings.xml | 2 | ||||
-rw-r--r-- | res/values-el/strings.xml | 2 | ||||
-rw-r--r-- | res/values-kk/strings.xml | 2 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 4 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 2 | ||||
-rw-r--r-- | res/values-sw/strings.xml | 26 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 4 | ||||
-rw-r--r-- | src/com/android/server/telecom/CallAudioRouteStateMachine.java | 42 | ||||
-rw-r--r-- | src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java | 14 | ||||
-rw-r--r-- | testapps/transactionalVoipApp/res/values-am/strings.xml | 2 | ||||
-rw-r--r-- | testapps/transactionalVoipApp/res/values-ca/strings.xml | 2 | ||||
-rw-r--r-- | testapps/transactionalVoipApp/res/values-kk/strings.xml | 2 | ||||
-rw-r--r-- | testapps/transactionalVoipApp/res/values-zh-rCN/strings.xml | 2 |
14 files changed, 62 insertions, 46 deletions
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 21c8d7cc3..f0923d5ca 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -128,7 +128,7 @@ <string name="callendpoint_name_earpiece" msgid="7047285080319678594">"ማዳመጫ"</string> <string name="callendpoint_name_bluetooth" msgid="210210953208913172">"ብሉቱዝ"</string> <string name="callendpoint_name_wiredheadset" msgid="6860787176412079742">"ባለገመድ ማዳመጫ"</string> - <string name="callendpoint_name_speaker" msgid="1971760468695323189">"ድምጽ ማውጫ"</string> + <string name="callendpoint_name_speaker" msgid="1971760468695323189">"ድምፅ ማውጫ"</string> <string name="callendpoint_name_streaming" msgid="2337595450408275576">"ውጫዊ"</string> <string name="callendpoint_name_unknown" msgid="2199074708477193852">"ያልታወቀ"</string> <string name="call_streaming_notification_body" msgid="502216105683378263">"ኦዲዮን ወደ ሌላ መሣሪያ በመልቀቅ ላይ"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index fff725758..4eead6668 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -73,7 +73,7 @@ <string name="non_primary_user" msgid="315564589279622098">"Det er kun ejeren af en enhed, der kan se og administrere blokerede numre."</string> <string name="delete_icon_description" msgid="5335959254954774373">"Fjern blokering"</string> <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Blokering er midlertidigt slået fra"</string> - <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Når du har ringet eller sendt en sms-besked til alarmcentralen, bliver blokering slået fra for at sikre, at alarmcentralen kan komme i kontakt med dig."</string> + <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Når du har ringet eller sendt en besked til alarmcentralen, bliver blokering slået fra for at sikre, at alarmcentralen kan komme i kontakt med dig."</string> <string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"Genaktiver nu"</string> <string name="blocked_numbers_number_blocked_message" msgid="4314736791180919167">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> blev blokeret"</string> <string name="blocked_numbers_number_unblocked_message" msgid="2933071624674945601">"Blokeringen af <xliff:g id="UNBLOCKED_NUMBER">%1$s</xliff:g> blev ophævet"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 2cf961d4d..6b58863e8 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -101,7 +101,7 @@ <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"Αποσυνδεδεμένες κλήσεις"</string> <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Εφαρμογές τηλεφώνου που αντιμετώπισαν σφάλμα λειτουργίας"</string> <string name="notification_channel_call_streaming" msgid="5100510699787538991">"Ροή κλήσης"</string> - <string name="alert_outgoing_call" msgid="5319895109298927431">"Εάν πραγματοποιήσετε αυτήν την κλήση, η κλήση σας μέσω <xliff:g id="OTHER_APP">%1$s</xliff:g> θα τερματιστεί."</string> + <string name="alert_outgoing_call" msgid="5319895109298927431">"Εάν πραγματοποιήσετε αυτή την κλήση, η κλήση σας μέσω <xliff:g id="OTHER_APP">%1$s</xliff:g> θα τερματιστεί."</string> <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Επιλέξτε πώς θα πραγματοποιήσετε την κλήση"</string> <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Ανακατεύθυνση της κλήσης μέσω <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string> <string name="alert_place_unredirect_outgoing_call" msgid="2467608535225764006">"Κλήση μέσω του αριθμού τηλεφώνου μου"</string> diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 628b44025..399da2030 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -69,7 +69,7 @@ <string name="unblock_button" msgid="8732021675729981781">"Бөгеуден шығару"</string> <string name="add_blocked_dialog_body" msgid="8599974422407139255">"Қоңыраулары мен мәтіндік хабарлары бөгелетін нөмір"</string> <string name="add_blocked_number_hint" msgid="8769422085658041097">"Телефон нөмірі"</string> - <string name="block_button" msgid="485080149164258770">"Бөгеу"</string> + <string name="block_button" msgid="485080149164258770">"Блоктау"</string> <string name="non_primary_user" msgid="315564589279622098">"Бөгелген нөмірлерді тек құрылғы иесі көре және басқара алады."</string> <string name="delete_icon_description" msgid="5335959254954774373">"Бөгеуді алу"</string> <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Тыйым уақытша алынды"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index e68f3c8e4..5fbe1d3aa 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -65,7 +65,7 @@ <string name="blocked_numbers" msgid="8322134197039865180">"Números bloqueados"</string> <string name="blocked_numbers_msg" msgid="2797422132329662697">"Não irá receber chamadas ou mensagens de texto de números bloqueados."</string> <string name="block_number" msgid="3784343046852802722">"Adicionar um número"</string> - <string name="unblock_dialog_body" msgid="2723393535797217261">"Pretende desbloquear <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string> + <string name="unblock_dialog_body" msgid="2723393535797217261">"Quer desbloquear <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string> <string name="unblock_button" msgid="8732021675729981781">"Desbloquear"</string> <string name="add_blocked_dialog_body" msgid="8599974422407139255">"Bloquear chamadas e mensagens de texto de"</string> <string name="add_blocked_number_hint" msgid="8769422085658041097">"Número de telefone"</string> @@ -102,7 +102,7 @@ <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Apps Telefone com falhas"</string> <string name="notification_channel_call_streaming" msgid="5100510699787538991">"Streaming de chamadas"</string> <string name="alert_outgoing_call" msgid="5319895109298927431">"Ao efetuar esta chamada, irá terminar a chamada na app <xliff:g id="OTHER_APP">%1$s</xliff:g>."</string> - <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Escolha como pretende efetuar esta chamada"</string> + <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Escolha como quer efetuar esta chamada"</string> <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Redirecionar chamada através de <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string> <string name="alert_place_unredirect_outgoing_call" msgid="2467608535225764006">"Ligar com o meu número de telefone"</string> <string name="alert_redirect_outgoing_call_timeout" msgid="5568101425637373060">"Não é possível efetuar uma chamada através da app <xliff:g id="OTHER_APP">%1$s</xliff:g>. Experimente utilizar uma app de redirecionamento de chamadas diferente ou contactar o programador para obter ajuda."</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index afb8eca46..a7fc3c741 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -57,7 +57,7 @@ <string name="change_default_dialer_dialog_affirmative" msgid="8604665314757739550">"Definir padrão"</string> <string name="change_default_dialer_dialog_negative" msgid="8648669840052697821">"Cancelar"</string> <string name="change_default_dialer_warning_message" msgid="8461963987376916114">"O <xliff:g id="NEW_APP">%s</xliff:g> poderá ligar e controlar todos os aspectos das chamadas. Defina como aplicativo Telefone padrão somente aqueles em que você confia."</string> - <string name="change_default_call_screening_dialog_title" msgid="5365787219927262408">"Usar o <xliff:g id="NEW_APP">%s</xliff:g> como seu app de seleção de chamadas padrão?"</string> + <string name="change_default_call_screening_dialog_title" msgid="5365787219927262408">"Usar o <xliff:g id="NEW_APP">%s</xliff:g> como seu app de filtro de ligações padrão?"</string> <string name="change_default_call_screening_warning_message_for_disable_old_app" msgid="2039830033533243164">"O <xliff:g id="OLD_APP">%s</xliff:g> não selecionará mais as chamadas."</string> <string name="change_default_call_screening_warning_message" msgid="9020537562292754269">"O <xliff:g id="NEW_APP">%s</xliff:g> poderá ver as informações sobre os autores das chamadas que não estão entre seus contatos e bloqueá-los. Defina como app de seleção de chamadas padrão somente aqueles em que você confia."</string> <string name="change_default_call_screening_dialog_affirmative" msgid="7162433828280058647">"Definir padrão"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 1b499900c..ef58c0044 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -48,11 +48,11 @@ <string name="enable_account_preference_title" msgid="6949224486748457976">"Akaunti za simu"</string> <string name="outgoing_call_not_allowed_user_restriction" msgid="3424338207838851646">"Piga simu za dharura pekee."</string> <string name="outgoing_call_not_allowed_no_permission" msgid="8590468836581488679">"Programu hii haiwezi kupiga simu bila ruhusa ya Simu."</string> - <string name="outgoing_call_error_no_phone_number_supplied" msgid="7665135102566099778">"Ili upige simu, weka nambari sahihi."</string> + <string name="outgoing_call_error_no_phone_number_supplied" msgid="7665135102566099778">"Ili upige simu, weka namba sahihi."</string> <string name="duplicate_video_call_not_allowed" msgid="5754746140185781159">"Hangout ya video haiwezi kuongezwa kwa wakati huu."</string> <string name="no_vm_number" msgid="2179959110602180844">"Nambari ya sauti inayokosekana"</string> - <string name="no_vm_number_msg" msgid="1339245731058529388">"Hakuna nambari ya ujumbe wa sauti iliyohifadhiwa katika SIM kadi."</string> - <string name="add_vm_number_str" msgid="5179510133063168998">"Ongeza nambari"</string> + <string name="no_vm_number_msg" msgid="1339245731058529388">"Hakuna namba ya ujumbe wa sauti iliyohifadhiwa katika SIM kadi."</string> + <string name="add_vm_number_str" msgid="5179510133063168998">"Ongeza namba"</string> <string name="change_default_dialer_dialog_title" msgid="5861469279421508060">"Unataka kufanya <xliff:g id="NEW_APP">%s</xliff:g> iwe programu chaguomsingi ya simu?"</string> <string name="change_default_dialer_dialog_affirmative" msgid="8604665314757739550">"Fanya iwe Chaguo-Msingi"</string> <string name="change_default_dialer_dialog_negative" msgid="8648669840052697821">"Ghairi"</string> @@ -63,21 +63,21 @@ <string name="change_default_call_screening_dialog_affirmative" msgid="7162433828280058647">"Weka iwe Chaguomsingi"</string> <string name="change_default_call_screening_dialog_negative" msgid="1839266125623106342">"Ghairi"</string> <string name="blocked_numbers" msgid="8322134197039865180">"Nambari zilizozuiwa"</string> - <string name="blocked_numbers_msg" msgid="2797422132329662697">"Hutapokea simu au SMS kutoka kwa nambari zilizozuiwa."</string> - <string name="block_number" msgid="3784343046852802722">"Ongeza nambari"</string> + <string name="blocked_numbers_msg" msgid="2797422132329662697">"Hutapokea simu au SMS kutoka kwa namba zilizozuiwa."</string> + <string name="block_number" msgid="3784343046852802722">"Ongeza namba"</string> <string name="unblock_dialog_body" msgid="2723393535797217261">"Ungependa kuacha kuzuia <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string> <string name="unblock_button" msgid="8732021675729981781">"Acha kuzuia"</string> <string name="add_blocked_dialog_body" msgid="8599974422407139255">"Zuia simu na SMS kutoka kwa"</string> <string name="add_blocked_number_hint" msgid="8769422085658041097">"Nambari ya simu"</string> <string name="block_button" msgid="485080149164258770">"Zuia"</string> - <string name="non_primary_user" msgid="315564589279622098">"Ni mmiliki wa kifaa pekee anayeweza kuangalia na kuthibiti nambari zilizozuiwa."</string> + <string name="non_primary_user" msgid="315564589279622098">"Ni mmiliki wa kifaa pekee anayeweza kuangalia na kuthibiti namba zilizozuiwa."</string> <string name="delete_icon_description" msgid="5335959254954774373">"Acha kuzuia"</string> <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Kipengele cha kuzuia kimezimwa kwa muda"</string> - <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Ukishapiga au kutuma ujumbe kwa nambari ya dharura, kipengele cha kuzuia anwani huzimwa ili watoa huduma za dharura waweze kuwasiliana nawe."</string> + <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Ukishapiga au kutuma ujumbe kwa namba ya dharura, kipengele cha kuzuia anwani huzimwa ili watoa huduma za dharura waweze kuwasiliana nawe."</string> <string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"Kiwashe tena sasa"</string> <string name="blocked_numbers_number_blocked_message" msgid="4314736791180919167">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> imezuiwa"</string> <string name="blocked_numbers_number_unblocked_message" msgid="2933071624674945601">"<xliff:g id="UNBLOCKED_NUMBER">%1$s</xliff:g> imeacha kuzuiwa"</string> - <string name="blocked_numbers_block_emergency_number_message" msgid="4198550501500893890">"Huwezi kuzuia nambari ya dharura."</string> + <string name="blocked_numbers_block_emergency_number_message" msgid="4198550501500893890">"Huwezi kuzuia namba ya dharura."</string> <string name="blocked_numbers_number_already_blocked_message" msgid="2301270825735665458">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> tayari imezuiwa."</string> <string name="toast_personal_call_msg" msgid="5817631570381795610">"Kupiga simu kwa kutumia kipiga simu cha binafsi"</string> <string name="notification_incoming_call" msgid="1233481138362230894">"Simu ya <xliff:g id="CALL_VIA">%1$s</xliff:g> kutoka kwa <xliff:g id="CALL_FROM">%2$s</xliff:g>"</string> @@ -104,19 +104,19 @@ <string name="alert_outgoing_call" msgid="5319895109298927431">"Ukipiga simu hii, simu yako kwenye <xliff:g id="OTHER_APP">%1$s</xliff:g> itakatwa."</string> <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Chagua jinsi utakavyopiga simu hii"</string> <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Elekeza simu ukitumia <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string> - <string name="alert_place_unredirect_outgoing_call" msgid="2467608535225764006">"Piga simu ukitumia nambari yangu ya simu"</string> + <string name="alert_place_unredirect_outgoing_call" msgid="2467608535225764006">"Piga simu ukitumia namba yangu ya simu"</string> <string name="alert_redirect_outgoing_call_timeout" msgid="5568101425637373060">"<xliff:g id="OTHER_APP">%1$s</xliff:g> imeshindwa kupiga simu. Jaribu kutumia programu nyingine inayoelekeza simu kwingine au uwasiliane na msanidi programu kwa usaidizi."</string> <string name="phone_settings_call_blocking_txt" msgid="7311523114822507178">"Kuzuia Simu"</string> <string name="phone_settings_number_not_in_contact_txt" msgid="2602249106007265757">"Nambari ambazo haziko kwenye Anwani"</string> - <string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"Zuia nambari ambazo hazipo kwenye orodha ya Anwani zako"</string> + <string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"Zuia namba ambazo hazipo kwenye orodha ya Anwani zako"</string> <string name="phone_settings_private_num_txt" msgid="6339272760338475619">"Faragha"</string> - <string name="phone_settings_private_num_summary_txt" msgid="6755758240544021037">"Zuia wapigaji ambao wameficha nambari zao za simu"</string> + <string name="phone_settings_private_num_summary_txt" msgid="6755758240544021037">"Zuia wapigaji ambao wameficha namba zao za simu"</string> <string name="phone_settings_payphone_txt" msgid="5003987966052543965">"Simu ya kulipia"</string> - <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"Zuia simu kutoka kwa nambari ya simu za kulipia"</string> + <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"Zuia simu kutoka kwa namba ya simu za kulipia"</string> <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"Zisizojulikani"</string> <string name="phone_settings_unknown_summary_txt" msgid="5446657192535779645">"Zuia simu kutoka kwa wapigaji wasiojulikana"</string> <string name="phone_settings_unavailable_txt" msgid="825918186053980858">"Zisizotambulishwa"</string> - <string name="phone_settings_unavailable_summary_txt" msgid="8221686031038282633">"Zuia simu zinazopigwa bila kutambulisha nambari ya simu"</string> + <string name="phone_settings_unavailable_summary_txt" msgid="8221686031038282633">"Zuia simu zinazopigwa bila kutambulisha namba ya simu"</string> <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="2895809176537908791">"Kuzuia Simu"</string> <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"Kipengele cha Kuzuia Simu kimezimwa"</string> <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="6629412508584507377">"Simu ya dharura imepigwa"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 071289e41..1ef0a552f 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -45,7 +45,7 @@ <string name="respond_via_sms_edittext_dialog_title" msgid="6579353156073272157">"快速回复"</string> <string name="respond_via_sms_confirmation_format" msgid="2932395476561267842">"讯息已发送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string> <string name="respond_via_sms_failure_format" msgid="5198680980054596391">"未能将信息发送到 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string> - <string name="enable_account_preference_title" msgid="6949224486748457976">"通话帐号"</string> + <string name="enable_account_preference_title" msgid="6949224486748457976">"通话账号"</string> <string name="outgoing_call_not_allowed_user_restriction" msgid="3424338207838851646">"只能拨打紧急呼救电话。"</string> <string name="outgoing_call_not_allowed_no_permission" msgid="8590468836581488679">"此应用没有电话权限,无法拨出电话。"</string> <string name="outgoing_call_error_no_phone_number_supplied" msgid="7665135102566099778">"要拨打电话,请输入有效的电话号码。"</string> @@ -90,7 +90,7 @@ <string name="answering_ends_other_managed_video_call" msgid="1988508241432031327">"如果接听此来电,您当前的视频通话会中断。"</string> <string name="answer_incoming_call" msgid="2045888814782215326">"接听"</string> <string name="decline_incoming_call" msgid="922147089348451310">"拒接"</string> - <string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"无法拨出电话,因为没有通话帐号支持拨打这类电话。"</string> + <string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"无法拨出电话,因为没有通话账号支持拨打这类电话。"</string> <string name="cant_call_due_to_ongoing_call" msgid="8004235328451385493">"由于当前正在进行 <xliff:g id="OTHER_CALL">%1$s</xliff:g> 通话,因此无法拨打电话。"</string> <string name="cant_call_due_to_ongoing_calls" msgid="6379163795277824868">"由于当前正在进行 <xliff:g id="OTHER_CALL">%1$s</xliff:g> 通话,因此无法拨打电话。"</string> <string name="cant_call_due_to_ongoing_unknown_call" msgid="8243532328969433172">"由于当前正在通过其他应用通话,因此无法拨打电话。"</string> diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java index c5423c2e1..4a03726c6 100644 --- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java +++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java @@ -1741,28 +1741,30 @@ public class CallAudioRouteStateMachine extends StateMachine { final boolean hasAnyCalls = mCallsManager.hasAnyCalls(); // These APIs are all via two-way binder calls so can potentially block Telecom. Since none // of this has to happen in the Telecom lock we'll offload it to the async executor. - mAsyncTaskExecutor.execute(() -> { - AudioDeviceInfo speakerDevice = null; - for (AudioDeviceInfo info : mAudioManager.getAvailableCommunicationDevices()) { - if (info.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) { - speakerDevice = info; - break; - } + + AudioDeviceInfo speakerDevice = null; + for (AudioDeviceInfo info : mAudioManager.getAvailableCommunicationDevices()) { + if (info.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) { + speakerDevice = info; + break; } - boolean speakerOn = false; - if (speakerDevice != null && on) { - boolean result = mAudioManager.setCommunicationDevice(speakerDevice); - if (result) { - speakerOn = true; - } - } else { - AudioDeviceInfo curDevice = mAudioManager.getCommunicationDevice(); - if (curDevice != null - && curDevice.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) { - mAudioManager.clearCommunicationDevice(); - } + } + boolean speakerOn = false; + if (speakerDevice != null && on) { + boolean result = mAudioManager.setCommunicationDevice(speakerDevice); + if (result) { + speakerOn = true; + } + } else { + AudioDeviceInfo curDevice = mAudioManager.getCommunicationDevice(); + if (curDevice != null + && curDevice.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) { + mAudioManager.clearCommunicationDevice(); } - mStatusBarNotifier.notifySpeakerphone(hasAnyCalls && speakerOn); + } + final boolean isSpeakerOn = speakerOn; + mAsyncTaskExecutor.execute(() -> { + mStatusBarNotifier.notifySpeakerphone(hasAnyCalls && isSpeakerOn); }); } diff --git a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java index 963e92317..05e73d544 100644 --- a/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java +++ b/src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java @@ -175,6 +175,20 @@ public class CallRedirectionProcessor implements CallRedirectionCallback { Log.endSession(); } } + + @Override + public void onBindingDied(ComponentName componentName) { + // Make sure we unbind the service if binding died to avoid background stating + // activity leaks + Log.startSession("CRSC.oBD"); + try { + synchronized (mTelecomLock) { + finishCallRedirection(); + } + } finally { + Log.endSession(); + } + } } private class CallRedirectionAdapter extends ICallRedirectionAdapter.Stub { diff --git a/testapps/transactionalVoipApp/res/values-am/strings.xml b/testapps/transactionalVoipApp/res/values-am/strings.xml index 120a9b9ce..d71c28739 100644 --- a/testapps/transactionalVoipApp/res/values-am/strings.xml +++ b/testapps/transactionalVoipApp/res/values-am/strings.xml @@ -29,7 +29,7 @@ <string name="set_call_inactive" msgid="7106775211368705195">"ወደ ገቢር ያልሆነ ተቀናብሯል"</string> <string name="disconnect_call" msgid="1349412380315371385">"ግንኙነትን ያቋርጡ"</string> <string name="request_earpiece_endpoint" msgid="6649571985089296573">"ማዳመጫ"</string> - <string name="request_speaker_endpoint" msgid="1033259535289845405">"ድምጽ ማውጫ"</string> + <string name="request_speaker_endpoint" msgid="1033259535289845405">"ድምፅ ማውጫ"</string> <string name="request_bluetooth_endpoint" msgid="5933254250623451836">"ብሉቱዝ"</string> <string name="start_stream" msgid="3567634786280097431">"ዥረት ይጀምሩ"</string> <string name="crash_app" msgid="2548690390730057704">"ለየት ያለ ነገርን ይጣሉ"</string> diff --git a/testapps/transactionalVoipApp/res/values-ca/strings.xml b/testapps/transactionalVoipApp/res/values-ca/strings.xml index 06f165569..550044425 100644 --- a/testapps/transactionalVoipApp/res/values-ca/strings.xml +++ b/testapps/transactionalVoipApp/res/values-ca/strings.xml @@ -31,7 +31,7 @@ <string name="request_earpiece_endpoint" msgid="6649571985089296573">"Auricular"</string> <string name="request_speaker_endpoint" msgid="1033259535289845405">"Altaveu"</string> <string name="request_bluetooth_endpoint" msgid="5933254250623451836">"Bluetooth"</string> - <string name="start_stream" msgid="3567634786280097431">"inicia la reproducció en continu"</string> + <string name="start_stream" msgid="3567634786280097431">"inicia la reproducció en línia"</string> <string name="crash_app" msgid="2548690390730057704">"llança una excepció"</string> <string name="update_notification" msgid="8677916482672588779">"actualitza la notificació a l\'estil de trucada en curs"</string> </resources> diff --git a/testapps/transactionalVoipApp/res/values-kk/strings.xml b/testapps/transactionalVoipApp/res/values-kk/strings.xml index 6511211ca..03fd03129 100644 --- a/testapps/transactionalVoipApp/res/values-kk/strings.xml +++ b/testapps/transactionalVoipApp/res/values-kk/strings.xml @@ -28,7 +28,7 @@ <string name="answer" msgid="5423590397665409939">"жауап беру"</string> <string name="set_call_inactive" msgid="7106775211368705195">"setInactive"</string> <string name="disconnect_call" msgid="1349412380315371385">"ажырату"</string> - <string name="request_earpiece_endpoint" msgid="6649571985089296573">"Динамик"</string> + <string name="request_earpiece_endpoint" msgid="6649571985089296573">"Телефон динамигі"</string> <string name="request_speaker_endpoint" msgid="1033259535289845405">"Динамик"</string> <string name="request_bluetooth_endpoint" msgid="5933254250623451836">"Bluetooth"</string> <string name="start_stream" msgid="3567634786280097431">"трансляцияны бастау"</string> diff --git a/testapps/transactionalVoipApp/res/values-zh-rCN/strings.xml b/testapps/transactionalVoipApp/res/values-zh-rCN/strings.xml index a434e3595..a74cbb539 100644 --- a/testapps/transactionalVoipApp/res/values-zh-rCN/strings.xml +++ b/testapps/transactionalVoipApp/res/values-zh-rCN/strings.xml @@ -19,7 +19,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="2907804426411305091">"事务性 API 测试活动"</string> <string name="in_call_activity_name" msgid="7545884666442897585">"通话活动中的事务"</string> - <string name="register_phone_account" msgid="1920315963082350332">"注册电话帐号"</string> + <string name="register_phone_account" msgid="1920315963082350332">"注册电话账号"</string> <string name="start_foreground_service" msgid="8968755699895128574">"启动 FGS(在后台模拟 MT + 应用)"</string> <string name="start_outgoing" msgid="1441644037370361864">"开始去电"</string> <string name="start_incoming" msgid="6444983300186361271">"开始来电"</string> |