Merge Android 12HEADmaster

Bug: 202323961
Merged-In: Idab7f31e09a61a61ef343855801e3bd7de7efd29
Change-Id: Ic0dcc6c4c45ca12feb9781ea68f98038d7e224ca

15 files changed, 43 insertions, 40 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b86b29..a16cf52 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,6 +36,7 @@
         android:allowBackup="true"
         android:supportsRtl="true">
         <service android:name="com.android.bips.BuiltInPrintService"
+                 android:exported="true"
                  android:permission="android.permission.BIND_PRINT_SERVICE">
             <intent-filter>
                 <action android:name="android.printservice.PrintService" />
@@ -73,6 +74,7 @@
             android:name="com.android.bips.ImagePrintActivity"
             android:label="@string/print"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -85,6 +87,7 @@
             android:name="com.android.bips.PdfPrintActivity"
             android:label="@string/print"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index dee0962..defbacd 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -41,7 +41,7 @@
     <string name="printer_description" msgid="8580767673213837142">"%1$s - %2$s"</string>
     <string name="title_activity_add_printer" msgid="9119216095769228566">"Dodajte štampač"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"Dodajte štampač prema IP adresi"</string>
-    <string name="hostname_or_ip" msgid="3460546103553992915">"Naziv host računara ili IP adresa"</string>
+    <string name="hostname_or_ip" msgid="3460546103553992915">"Naziv glavnog računara ili IP adresa"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
     <string name="add" msgid="1950342261671100906">"Dodaj"</string>
     <string name="add_named" msgid="9074106244018070583">"Dodaj štampač <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
@@ -49,7 +49,7 @@
     <string name="printer_not_supported" msgid="281955849350938408">"Štampač nije podržan"</string>
     <string name="wifi_direct" msgid="4629404342852294985">"WiFi Direct"</string>
     <string name="find_wifi_direct" msgid="5270504288829123954">"Pronađite štampače s opcijom WiFi Direct"</string>
-    <string name="wifi_direct_printing" msgid="8423811041563144048">"Štampanje putem Wi-Fi Directa"</string>
+    <string name="wifi_direct_printing" msgid="8423811041563144048">"Štampanje putem opcije Wi-Fi Direct"</string>
     <string name="wifi_direct_printers" msgid="541168032444693191">"Štampači s opcijom WiFi Direct"</string>
     <string name="searching" msgid="2114018057619514587">"Pretraživanje…"</string>
     <string name="connect_hint_text" msgid="587112503851044234">"Možda ćete morati odobriti ovo povezivanje na prednjoj tabli vašeg štampača"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 55b935b..872769f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -49,7 +49,7 @@
     <string name="printer_not_supported" msgid="281955849350938408">"La impressora no és compatible"</string>
     <string name="wifi_direct" msgid="4629404342852294985">"Wi-Fi Direct"</string>
     <string name="find_wifi_direct" msgid="5270504288829123954">"Cerca impressores Wi-Fi Direct"</string>
-    <string name="wifi_direct_printing" msgid="8423811041563144048">"Impressió per Wi‑Fi Direct"</string>
+    <string name="wifi_direct_printing" msgid="8423811041563144048">"Impressió Wi‑Fi Direct"</string>
     <string name="wifi_direct_printers" msgid="541168032444693191">"Impressores Wi-Fi Direct"</string>
     <string name="searching" msgid="2114018057619514587">"S\'està cercant…"</string>
     <string name="connect_hint_text" msgid="587112503851044234">"És possible que hagis d\'aprovar aquesta connexió al tauler frontal de la impressora"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index d5592d0..32fabb3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -43,7 +43,7 @@
     <string name="add_printer_by_ip" msgid="562864787592910327">"Printeri lisamine IP-aadressi järgi"</string>
     <string name="hostname_or_ip" msgid="3460546103553992915">"Hostinimi või IP-aadress"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
-    <string name="add" msgid="1950342261671100906">"Lisa"</string>
+    <string name="add" msgid="1950342261671100906">"Lisamine"</string>
     <string name="add_named" msgid="9074106244018070583">"Printeri <xliff:g id="PRINTER">%1$s</xliff:g> lisamine"</string>
     <string name="no_printer_found" msgid="4777867380924351173">"Sellelt aadressilt ei leitud printerit"</string>
     <string name="printer_not_supported" msgid="281955849350938408">"Printerit ei toetata"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index e67e9ff..7aab0f0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -71,9 +71,9 @@
     <string name="accept" msgid="4426153292469698134">"Aceptar"</string>
     <string name="reject" msgid="24751635160440693">"Rexeitar"</string>
     <string name="connections" msgid="8895413761760117180">"Conexións"</string>
-    <string name="wifi_direct_problem" msgid="8995174986718516990">"O servizo de impresión predeterminado non puido atopar impresoras con Wi-Fi Direct"</string>
+    <string name="wifi_direct_problem" msgid="8995174986718516990">"O servizo de impresión predeterminada non puido atopar impresoras con Wi-Fi Direct"</string>
     <string name="disable_wifi_direct" msgid="4824677957241687577">"Desact. Wi-Fi Direct"</string>
-    <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"O servizo de impresión predeterminado require permisos de acceso á localización para atopar dispositivos próximos."</string>
+    <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"O servizo de impresión predeterminada require permisos de acceso á localización para atopar dispositivos próximos."</string>
     <string name="fix" msgid="7784394272611365393">"Revisar permiso"</string>
     <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"A función de impresión predeterminada precisa que os servizos de localización estean activados para atopar dispositivos próximos."</string>
     <string name="enable_location" msgid="3627841004298863140">"Activar localización"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f353662..fb8f5c8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -39,7 +39,7 @@
     <string name="media_size_8x10in" msgid="1872576638522812402">"8x10 in"</string>
     <string name="media_size_4x6in" msgid="3093276425529958253">"4x6 in"</string>
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
-    <string name="title_activity_add_printer" msgid="9119216095769228566">"Dodajte pisač"</string>
+    <string name="title_activity_add_printer" msgid="9119216095769228566">"Dodaj pisač"</string>
     <string name="add_printer_by_ip" msgid="562864787592910327">"Dodajte pisač prema IP adresi"</string>
     <string name="hostname_or_ip" msgid="3460546103553992915">"Naziv hosta ili IP adresa"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 286f445..6b83967 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -60,7 +60,7 @@
     <string name="forget" msgid="892068061425802502">"Ұмыту"</string>
     <string name="connects_via_wifi_direct" msgid="652300632780158437">"Wi-Fi Direct арқылы жалғанады"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"<xliff:g id="IP_ADDRESS">%1$s</xliff:g> мекенжайындағы желі арқылы жалғанады"</string>
-    <string name="recommendation_summary" msgid="2979700524954307566">"Әдепкі принтер қызметі негізгі функцияларды атқарады. Бұл принтердің өзге функциялары басқа басып шығару қызметінде болуы мүмкін."</string>
+    <string name="recommendation_summary" msgid="2979700524954307566">"Әдепкі басып шығару қызметі негізгі опцияларға ие. Бұл принтердің өзге опциялары басқа басып шығару қызметінде қолжетімді болуы мүмкін."</string>
     <string name="recommendations_heading" msgid="5086762263560605249">"Ұсынылған қызметтер"</string>
     <string name="recommendation_install_summary" msgid="374785283809791669">"Орнату үшін таңдаңыз."</string>
     <string name="recommendation_enable_summary" msgid="3500907868251326224">"Қосу үшін таңдаңыз."</string>
@@ -71,11 +71,11 @@
     <string name="accept" msgid="4426153292469698134">"Қабылдау"</string>
     <string name="reject" msgid="24751635160440693">"Қабылдамау"</string>
     <string name="connections" msgid="8895413761760117180">"Байланыстар"</string>
-    <string name="wifi_direct_problem" msgid="8995174986718516990">"Әдепкі принтер қызметі Wi-Fi Direct принтерлерін таба алмайды."</string>
+    <string name="wifi_direct_problem" msgid="8995174986718516990">"Әдепкі басып шығару қызметі Wi-Fi Direct принтерлерін таба алмайды."</string>
     <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct ажырату"</string>
-    <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Маңайдағы құрылғыларды табу үшін Әдепкі принтер қызметіне локацияны пайдалану рұқсаты қажет."</string>
+    <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Маңайдағы құрылғыларды табу үшін Default Print қызметіне геодерек пайдалану рұқсаттары қажет."</string>
     <string name="fix" msgid="7784394272611365393">"Рұқсатты қарау"</string>
-    <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Әдепкі принтер қызметі маңайдағы құрылғыларды таба алуы үшін локация қызметтерін қосу қажет."</string>
+    <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Әдепкі басып шығару қызметі маңайдағы құрылғыларды табу үшін орынды анықтау қызметтерінің қосылуын қажет етеді."</string>
     <string name="enable_location" msgid="3627841004298863140">"Орын анықтауды қосу"</string>
     <string name="print" msgid="7851318072404916362">"Басып шығару"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 9d2d269..0ae920b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="3551052199033657984">"ಡೀಫಾಲ್ಟ್ ಪ್ರಿಂಟ್ ಸೇವೆ"</string>
+    <string name="app_name" msgid="3551052199033657984">"ಡೀಫಾಲ್ಟ್ ಮುದ್ರಣ ಸೇವೆ"</string>
     <string name="printer_busy" msgid="8604311528104955859">"ಕಾರ್ಯನಿರತವಾಗಿದೆ"</string>
     <string name="printer_out_of_paper" msgid="4882186432807703877">"ಕಾಗದ ಖಾಲಿಯಾಗಿದೆ"</string>
     <string name="printer_out_of_ink" msgid="7361897651097675464">"ಶಾಯಿ ಖಾಲಿಯಾಗಿದೆ"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 04336c4..9815253 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -29,7 +29,7 @@
     <string name="printer_offline" msgid="9196864753298645066">"အော့ဖ်လိုင်းဖြစ်နေသည်"</string>
     <string name="printer_bad_certificate" msgid="1366180387095466268">"အသိအမှတ်ပြုလက်မှတ် မမှန်ကန်ပါ"</string>
     <string name="printer_not_encrypted" msgid="1913051469275483673">"အသွင်ဝှက် မထားပါ"</string>
-    <string name="printer_check" msgid="6428369671197132828">"ပရင်တာကို စစ်ဆေးရန်"</string>
+    <string name="printer_check" msgid="6428369671197132828">"ပုံနှိပ်စက်ကို စစ်ဆေးရန်"</string>
     <string name="waiting_to_send" msgid="2022115199902822180">"ပို့ရန် စောင့်နေသည်"</string>
     <string name="unreadable_input" msgid="2199948329556527912">"စာရွက်စာတမ်းကို ဖတ်၍မရပါ"</string>
     <string name="media_size_l" msgid="164416542021598181">"ကြီး"</string>
@@ -40,13 +40,13 @@
     <string name="media_size_4x6in" msgid="3093276425529958253">"၄x၆ လက်မ"</string>
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
     <string name="title_activity_add_printer" msgid="9119216095769228566">"ပရင်တာ ထည့်ရန်"</string>
-    <string name="add_printer_by_ip" msgid="562864787592910327">"ပရင်တာကို IP လိပ်စာဖြင့် ထည့်ရန်"</string>
+    <string name="add_printer_by_ip" msgid="562864787592910327">"ပုံနှိပ်စက်ကို IP လိပ်စာဖြင့် ထည့်ရန်"</string>
     <string name="hostname_or_ip" msgid="3460546103553992915">"အင်တာနက်လက်ခံဝန်ဆောင်ပေးသူအမည် သို့မဟုတ် အိုင်ပီလိပ်စာ"</string>
     <string name="ip_hint" msgid="7939777481941979799">"၁၉၂.၁၆၈.၀.၄"</string>
     <string name="add" msgid="1950342261671100906">"ထည့်ရန်"</string>
     <string name="add_named" msgid="9074106244018070583">"<xliff:g id="PRINTER">%1$s</xliff:g> ကို ထည့်ရန်"</string>
-    <string name="no_printer_found" msgid="4777867380924351173">"ဤလိပ်စာတွင် ပရင်တာတစ်ခုမျှ မတွေ့ပါ"</string>
-    <string name="printer_not_supported" msgid="281955849350938408">"ပရင်တာကို ပံ့ပိုးခြင်းမရှိပါ"</string>
+    <string name="no_printer_found" msgid="4777867380924351173">"ဤလိပ်စာတွင် ပုံနှိပ်စက်တစ်ခုမျှ မတွေ့ပါ"</string>
+    <string name="printer_not_supported" msgid="281955849350938408">"ပုံနှိပ်စက်ကို ပံ့ပိုးခြင်းမရှိပါ"</string>
     <string name="wifi_direct" msgid="4629404342852294985">"Wi-Fi Direct"</string>
     <string name="find_wifi_direct" msgid="5270504288829123954">"Wi-Fi တိုက်ရိုက်သုံး ပုံနှိပ်စက်များကို ရှာရန်"</string>
     <string name="wifi_direct_printing" msgid="8423811041563144048">"တိုက်ရိုက် Wi-Fi ပုံနှိပ်ခြင်း"</string>
@@ -60,14 +60,14 @@
     <string name="forget" msgid="892068061425802502">"မေ့ပစ်ရန်"</string>
     <string name="connects_via_wifi_direct" msgid="652300632780158437">"Wi-Fi Direct ဖြင့် ချိတ်ဆက်သည်"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"<xliff:g id="IP_ADDRESS">%1$s</xliff:g> ရှိ လက်ရှိကွန်ရက် မှတစ်ဆင့် ချိတ်ဆက်သည်"</string>
-    <string name="recommendation_summary" msgid="2979700524954307566">"မူရင်းပုံနှိပ်ခြင်းဝန်ဆောင်မှုတွင် အခြေခံလုပ်ဆောင်ချက်များ ပါဝင်သည်။ ဤပရင်တာအတွက် အခြားလုပ်ဆောင်ချက်များကို အခြားပုံနှိပ်ခြင်းဝန်ဆောင်မှုမှ ရနိုင်ပါမည်။"</string>
+    <string name="recommendation_summary" msgid="2979700524954307566">"မူရင်းပုံနှိပ်ခြင်းဝန်ဆောင်မှုတွင် အခြေခံလုပ်ဆောင်ချက်များ ပါဝင်သည်။ ဤပုံနှိပ်စက်အတွက် အခြားလုပ်ဆောင်ချက်များကို အခြားပုံနှိပ်ခြင်းဝန်ဆောင်မှုမှ ရနိုင်ပါမည်။"</string>
     <string name="recommendations_heading" msgid="5086762263560605249">"အကြံပြုထားသည့် ဝန်ဆောင်မှုများ"</string>
     <string name="recommendation_install_summary" msgid="374785283809791669">"ထည့်သွင်းရန် ရွေးပါ"</string>
     <string name="recommendation_enable_summary" msgid="3500907868251326224">"ဖွင့်ရန် ရွေးပါ"</string>
     <string name="recommendation_manage" msgid="4683640588502866284">"ဝန်ဆောင်မှုများ စီမံခန့်ခွဲရန်"</string>
     <string name="security" msgid="2279008326210305401">"လုံခြုံရေး"</string>
-    <string name="certificate_update_request" msgid="1314796413107139475">"ဤပရင်တာက လုံခြုံရေး အသိအမှတ်ပြုလက်မှတ်အသစ်ကို ထုတ်ပေးလိုက်သည် သို့မဟုတ် အခြားစက်ပစ္စည်းတစ်ခုက ၎င်းအဖြစ် အယောင်ဆောင်နေခြင်းဖြစ်သည်။ အသိအမှတ်ပြုလက်မှတ်အသစ်ကို လက်ခံမလား။"</string>
-    <string name="not_encrypted_request" msgid="4871472176807381642">"ဤပရင်တာက အသွင်ဝှက်ထားသော အလုပ်များကို လက်ခံတော့မည် မဟုတ်ပါ။ ဆက်လက် ပုံနှိပ်ထုတ်လိုသလား။"</string>
+    <string name="certificate_update_request" msgid="1314796413107139475">"ဤပုံနှိပ်ထုတ်စက်က လုံခြုံရေး အသိအမှတ်ပြုလက်မှတ်အသစ်ကို ထုတ်ပေးလိုက်သည် သို့မဟုတ် အခြားစက်ပစ္စည်းတစ်ခုက ၎င်းအဖြစ် အယောင်ဆောင်နေခြင်းဖြစ်သည်။ အသိအမှတ်ပြုလက်မှတ်အသစ်ကို လက်ခံမလား။"</string>
+    <string name="not_encrypted_request" msgid="4871472176807381642">"ဤပုံနှိပ်ထုတ်စက်က အသွင်ဝှက်ထားသော အလုပ်များကို လက်ခံတော့မည် မဟုတ်ပါ။ ဆက်လက် ပုံနှိပ်ထုတ်လိုသလား။"</string>
     <string name="accept" msgid="4426153292469698134">"လက်ခံရန်"</string>
     <string name="reject" msgid="24751635160440693">"ပယ်ရန်"</string>
     <string name="connections" msgid="8895413761760117180">"ချိတ်ဆက်မှုများ"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0ce0cd0..451ccd0 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -75,7 +75,7 @@
     <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct अफ गर्नु…"</string>
     <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"डिफल्ट छपाइ सेवालाई वरपरका यन्त्रहरू फेला पार्न स्थानसम्बन्धी अनुमति चाहिन्छ।"</string>
     <string name="fix" msgid="7784394272611365393">"अनुमतिको समीक्षा गर्नु"</string>
-    <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"डिफल्ट प्रिन्ट सेवाले लोकेसन सर्भिस अन गरेपछि मात्र नजिकैका डिभाइसहरू फेला पार्न सक्छ।"</string>
-    <string name="enable_location" msgid="3627841004298863140">"लोकेसन सर्भिस अन गर्नु…"</string>
+    <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"डिफल्ट प्रिन्ट सेवाले स्थानसम्बन्धी सेवा अन गरेपछि मात्र नजिकैका यन्त्रहरू फेला पार्न सक्छ।"</string>
+    <string name="enable_location" msgid="3627841004298863140">"स्थानसम्बन्धी सेवा अन गर्नु…"</string>
     <string name="print" msgid="7851318072404916362">"प्रिन्ट गर्नुहोस्"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9f85b40..2c99c0f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -40,7 +40,7 @@
     <string name="media_size_4x6in" msgid="3093276425529958253">"4 x 6 palcev"</string>
     <string name="printer_description" msgid="8580767673213837142">"%1$s – %2$s"</string>
     <string name="title_activity_add_printer" msgid="9119216095769228566">"Dodajanje tiskalnika"</string>
-    <string name="add_printer_by_ip" msgid="562864787592910327">"Dodajte tiskalnik z naslovom IP"</string>
+    <string name="add_printer_by_ip" msgid="562864787592910327">"Dodaj tiskalnik z naslovom IP"</string>
     <string name="hostname_or_ip" msgid="3460546103553992915">"Ime gostitelja ali naslov IP"</string>
     <string name="ip_hint" msgid="7939777481941979799">"192.168.0.4"</string>
     <string name="add" msgid="1950342261671100906">"Dodaj"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b2db923..a5640a1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -47,10 +47,10 @@
     <string name="add_named" msgid="9074106244018070583">"Lägg till <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="no_printer_found" msgid="4777867380924351173">"Ingen skrivare hittades på den här adressen"</string>
     <string name="printer_not_supported" msgid="281955849350938408">"Skrivaren stöds inte"</string>
-    <string name="wifi_direct" msgid="4629404342852294985">"wifi Direct"</string>
-    <string name="find_wifi_direct" msgid="5270504288829123954">"Hitta skrivare med wifi Direct"</string>
-    <string name="wifi_direct_printing" msgid="8423811041563144048">"Utskrift via wifi Direct"</string>
-    <string name="wifi_direct_printers" msgid="541168032444693191">"Skrivare med wifi Direct"</string>
+    <string name="wifi_direct" msgid="4629404342852294985">"Wi-Fi Direct"</string>
+    <string name="find_wifi_direct" msgid="5270504288829123954">"Hitta skrivare med Wi-Fi Direct"</string>
+    <string name="wifi_direct_printing" msgid="8423811041563144048">"Utskrift via Wi-Fi Direct"</string>
+    <string name="wifi_direct_printers" msgid="541168032444693191">"Skrivare med Wi-Fi Direct"</string>
     <string name="searching" msgid="2114018057619514587">"Söker …"</string>
     <string name="connect_hint_text" msgid="587112503851044234">"Du kan behöva godkänna anslutningen på frontpanelen på skrivaren"</string>
     <string name="connecting_to" msgid="2665161014972086194">"Ansluter till <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
@@ -58,7 +58,7 @@
     <string name="failed_connection" msgid="8068661997318286575">"Det gick inte att ansluta till <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="saved_printers" msgid="4567534965213125526">"Sparade skrivare"</string>
     <string name="forget" msgid="892068061425802502">"Glöm"</string>
-    <string name="connects_via_wifi_direct" msgid="652300632780158437">"Ansluter via wifi Direct"</string>
+    <string name="connects_via_wifi_direct" msgid="652300632780158437">"Ansluter via Wi-Fi Direct"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"Ansluter via det nuvarande nätverket på <xliff:g id="IP_ADDRESS">%1$s</xliff:g>"</string>
     <string name="recommendation_summary" msgid="2979700524954307566">"Standardutskriftstjänsten har de grundläggande alternativen. Med en annan utskriftstjänst kan det finnas fler alternativ tillgängliga för den här skrivaren."</string>
     <string name="recommendations_heading" msgid="5086762263560605249">"Rekommenderade tjänster"</string>
@@ -71,8 +71,8 @@
     <string name="accept" msgid="4426153292469698134">"Godkänn"</string>
     <string name="reject" msgid="24751635160440693">"Godkänn inte"</string>
     <string name="connections" msgid="8895413761760117180">"Anslutningar"</string>
-    <string name="wifi_direct_problem" msgid="8995174986718516990">"Standardtjänsten för utskrift kan inte hitta skrivare med wifi Direct"</string>
-    <string name="disable_wifi_direct" msgid="4824677957241687577">"wifi Direct av"</string>
+    <string name="wifi_direct_problem" msgid="8995174986718516990">"Standardtjänsten för utskrift kan inte hitta skrivare med Wi-Fi Direct"</string>
+    <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct av"</string>
     <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Standardtjänsten för utskrift behöver platsbehörighet för att kunna upptäcka enheter i närheten."</string>
     <string name="fix" msgid="7784394272611365393">"Granska behörighet"</string>
     <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Platstjänster måste ha aktiverats för att standardtjänsten för utskrift ska kunna upptäcka enheter i närheten."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2c3645f..00f1482 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="3551052199033657984">"Стандартний сервіс друку"</string>
+    <string name="app_name" msgid="3551052199033657984">"Сервіс друку за умовчанням"</string>
     <string name="printer_busy" msgid="8604311528104955859">"Зайнятий"</string>
     <string name="printer_out_of_paper" msgid="4882186432807703877">"Закінчився папір"</string>
     <string name="printer_out_of_ink" msgid="7361897651097675464">"Закінчилося чорнило"</string>
@@ -60,7 +60,7 @@
     <string name="forget" msgid="892068061425802502">"Забути"</string>
     <string name="connects_via_wifi_direct" msgid="652300632780158437">"Під’єднується через Wi-Fi Direct"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"Під’єднується через поточну мережу за IP-адресою <xliff:g id="IP_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="recommendation_summary" msgid="2979700524954307566">"Стандартний сервіс друку надає основні параметри. Інші параметри цього принтера можуть походити з інших сервісів друку."</string>
+    <string name="recommendation_summary" msgid="2979700524954307566">"Основні параметри постачальників послуг стандартного друку. Інші параметри цього принтера можуть бути доступними в інших сервісах друку."</string>
     <string name="recommendations_heading" msgid="5086762263560605249">"Рекомендовані сервіси"</string>
     <string name="recommendation_install_summary" msgid="374785283809791669">"Виберіть, щоб установити"</string>
     <string name="recommendation_enable_summary" msgid="3500907868251326224">"Виберіть, щоб увімкнути"</string>
@@ -71,11 +71,11 @@
     <string name="accept" msgid="4426153292469698134">"Прийняти"</string>
     <string name="reject" msgid="24751635160440693">"Відхилити"</string>
     <string name="connections" msgid="8895413761760117180">"З\'єднання"</string>
-    <string name="wifi_direct_problem" msgid="8995174986718516990">"Стандартний сервіс друку не може знайти принтери Wi-Fi Direct"</string>
+    <string name="wifi_direct_problem" msgid="8995174986718516990">"Сервіс Default Print не може знайти принтери Wi-Fi Direct"</string>
     <string name="disable_wifi_direct" msgid="4824677957241687577">"Вимк. Wi-Fi Direct"</string>
-    <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Стандартному сервісу друку потрібен дозвіл на доступ до геоданих, щоб знаходити пристрої поруч."</string>
+    <string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Сервісу Default Print потрібен дозвіл на доступ до геоданих, щоб знаходити пристрої поруч."</string>
     <string name="fix" msgid="7784394272611365393">"Перевірити дозволи"</string>
-    <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Стандартний сервіс друку знаходитиме пристрої поруч, лише якщо ввімкнути служби локації."</string>
+    <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Сервісу Default Print потрібен доступ до служб локації, щоб знаходити пристрої поруч."</string>
     <string name="enable_location" msgid="3627841004298863140">"Увімкнути геодані"</string>
     <string name="print" msgid="7851318072404916362">"Друк"</string>
 </resources>
diff --git a/src/com/android/bips/BuiltInPrintService.java b/src/com/android/bips/BuiltInPrintService.java
index aa8aafa..e62cb66 100644
--- a/src/com/android/bips/BuiltInPrintService.java
+++ b/src/com/android/bips/BuiltInPrintService.java
@@ -317,13 +317,13 @@ public class BuiltInPrintService extends PrintService {
                 .setAction(ACTION_CERTIFICATE_REJECT)
                 .putExtra(EXTRA_PRINTER_ID, printerId);
         PendingIntent pendingRejectIntent = PendingIntent.getService(this, CERTIFICATE_REQUEST_ID,
-                rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         Notification.Action rejectAction = new Notification.Action.Builder(
                 Icon.createWithResource(this, R.drawable.ic_printservice),
                 getString(R.string.reject), pendingRejectIntent).build();
 
         PendingIntent deleteIntent = PendingIntent.getService(this, CERTIFICATE_REQUEST_ID,
-                rejectIntent, 0);
+                rejectIntent,  PendingIntent.FLAG_IMMUTABLE);
 
         Intent acceptIntent = new Intent(this, BuiltInPrintService.class)
                 .setAction(ACTION_CERTIFICATE_ACCEPT)
@@ -333,7 +333,7 @@ public class BuiltInPrintService extends PrintService {
             acceptIntent.putExtra(EXTRA_CERTIFICATE, certificate);
         }
         PendingIntent pendingAcceptIntent = PendingIntent.getService(this, CERTIFICATE_REQUEST_ID,
-                acceptIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                acceptIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         Notification.Action acceptAction = new Notification.Action.Builder(
                 Icon.createWithResource(this, R.drawable.ic_printservice),
                 getString(R.string.accept), pendingAcceptIntent).build();
diff --git a/src/com/android/bips/P2pPermissionManager.java b/src/com/android/bips/P2pPermissionManager.java
index e9be8c2..027d764 100644
--- a/src/com/android/bips/P2pPermissionManager.java
+++ b/src/com/android/bips/P2pPermissionManager.java
@@ -225,7 +225,7 @@ public class P2pPermissionManager {
         proceedIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         proceedIntent.putExtra(AddPrintersFragment.EXTRA_FIX_P2P_PERMISSION, true);
         PendingIntent proceedPendingIntent = PendingIntent.getActivity(mContext, 0,
-                proceedIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                proceedIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         Notification.Action fixAction = new Notification.Action.Builder(
                 Icon.createWithResource(mContext, R.drawable.ic_printservice),
                 mContext.getString(R.string.fix), proceedPendingIntent).build();
@@ -234,13 +234,13 @@ public class P2pPermissionManager {
                 .setAction(BuiltInPrintService.ACTION_P2P_PERMISSION_CANCEL);
         PendingIntent cancelPendingIndent = PendingIntent.getService(mContext,
                 BuiltInPrintService.P2P_PERMISSION_REQUEST_ID, cancelIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         Intent disableIntent = new Intent(mContext, BuiltInPrintService.class)
                 .setAction(BuiltInPrintService.ACTION_P2P_DISABLE);
         PendingIntent disablePendingIndent = PendingIntent.getService(mContext,
                 BuiltInPrintService.P2P_PERMISSION_REQUEST_ID, disableIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         Notification.Action disableAction = new Notification.Action.Builder(
                 Icon.createWithResource(mContext, R.drawable.ic_printservice),
                 mContext.getString(R.string.disable_wifi_direct), disablePendingIndent).build();