Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Reconciling sessionIds to prevent race condition on different package installations.
Reconciling sessionIds to prevent race condition on different package installations.
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Change-Id: I22522cb0596511549afdeb690a72b1b705c5f771
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0e9bf09..23cbb59 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -23,7 +23,7 @@
<string name="provisioning_error_title" msgid="6320515739861578118">"ውይ!"</string>
<string name="setup_work_profile" msgid="1468934631731845267">"የሥራ መገለጫን ያዋቅሩ"</string>
<string name="company_controls_workspace" msgid="2808025277267917221">"ድርጅትዎ ይህን መገለጫ ይቆጣጠራል፣ እና ደህንነቱን ይጠብቃል። መሣሪያዎ ላይ ያለውን የተቀረው ነገር እርስዎ ነዎት የሚቆጣጠሩት።"</string>
- <string name="company_controls_device" msgid="8230957518758871390">"የእርስዎ ድርጅት ይህንን መሳሪያ ይቆጣጠረዋል፣ እና እንደተጠበቀ ያስቀምጠዋል።"</string>
+ <string name="company_controls_device" msgid="8230957518758871390">"የእርስዎ ድርጅት ይህንን መሣሪያ ይቆጣጠረዋል፣ እና እንደተጠበቀ ያስቀምጠዋል።"</string>
<string name="the_following_is_your_mdm" msgid="6613658218262376404">"የሚከተለው መተግበሪያ ይህን መገለጫ መድረስ ያስፈልገዋል።"</string>
<string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"የሚከተለው መተግበሪያ መሣሪያዎን ያስተዳድረዋል፦"</string>
<string name="next" msgid="1004321437324424398">"ቀጣይ"</string>
@@ -158,11 +158,11 @@
<string name="brand_screen_header" msgid="8865808542690116648">"ይህ መሣሪያ የድርጅትዎ ነው"</string>
<string name="brand_screen_subheader" msgid="7664792208784456436">"የሚከተለው መተግበሪያ ይህን ስልክ ለማቀናበር እና ለመከታተል ስራ ላይ ይውላል"</string>
<string name="account_management_disclaimer_header" msgid="8013083414694316564">"የእርስዎ መለያ የሚተዳደር ነው"</string>
- <string name="account_management_disclaimer_subheader" msgid="5146471918840236988">"የእርስዎ የአይቲ አስተዳዳሪ የደህንነት መመሪያዎችን ለማስፈፀም የሞባይል መሳሪያ አስተዳደርን ይጠቀማል"</string>
+ <string name="account_management_disclaimer_subheader" msgid="5146471918840236988">"የእርስዎ የአይቲ አስተዳዳሪ የደህንነት መመሪያዎችን ለማስፈፀም የሞባይል መሣሪያ አስተዳደርን ይጠቀማል"</string>
<string name="downloading_administrator_header" msgid="8660294318893902915">"ለሥራ ቅንብር በመዘጋጀት ላይ…"</string>
<string name="work_profile_provisioning_accept_header_post_suw" msgid="1353127953275291089">"መጀመሪያ የስራ መገለጫዎን እናቀናብረው"</string>
<string name="work_profile_provisioning_step_1_header" msgid="7914961694921466366">"የሥራ መተግበሪያዎች በእርስዎ የሥራ መገለጫ ውስጥ ይቀመጣሉ"</string>
- <string name="work_profile_provisioning_step_2_header" msgid="6001172190404670248">"ለቀኑ የሚበቃዎትን ያክል ከሠሩ በኋላ የሥራ መተግበሪያዎችን ላፍታ ያስቁሙ"</string>
+ <string name="work_profile_provisioning_step_2_header" msgid="6001172190404670248">"ለቀኑ የሚበቃዎትን ያህል ከሠሩ በኋላ የሥራ መተግበሪያዎችን ላፍታ ያስቁሙ"</string>
<string name="work_profile_provisioning_step_3_header" msgid="4316106639726774330">"በእርስዎ የሥራ መገለጫ ውስጥ ያለ ውሂብ ለእርስዎ አይቲ አስተዳዳሪ የሚታይ ነው"</string>
<string name="work_profile_provisioning_progress_label" msgid="2627905308998389193">"የሥራ መገለጫዎን በማዘጋጀት ላይ…"</string>
<string name="work_profile_provisioning_summary" msgid="3436190271657388747">"የሥራ መተግበሪያዎች በእርስዎ የሥራ መገለጫ ውስጥ ይቀመጣሉ። ለቀኑ የሚበቃዎት ያህል ከሠሩ በኋላ የእርስዎን የሥራ መተግበሪያዎች ባለበት ማስቆም ይችላሉ። በእርስዎ የሥራ መገለጫ ውስጥ ያለ ውሂብ ለእርስዎ የአይቲ አስተዳዳሪ የሚታይ ነው።"</string>
@@ -179,7 +179,7 @@
<string name="fully_managed_device_provisioning_return_device_title" msgid="8500829014794276683">"ይህንን መሣሪያ ወደ የእርስዎ የአይቲ አስተዳዳሪ ይመልሱ"</string>
<string name="fully_managed_device_provisioning_return_device_subheader" msgid="6194410367910957686">"ወደ ቀዳሚው ማያ ገጽ ይመለሱ፣ ወይም ይህን መሣሪያ ዳግም ያስጀምሩት እና ወደ የእርስዎ የአይቲ አስተዳዳሪ ይመልሱ።"</string>
<string name="fully_managed_device_cancel_setup_button" msgid="4910041382610777599">"ማዋቀር ይቅር"</string>
- <string name="fully_managed_device_reset_and_return_button" msgid="6451125722998550681">"ዳግም ያስጀምሩ እና መሳሪያ አውጣ"</string>
+ <string name="fully_managed_device_reset_and_return_button" msgid="6451125722998550681">"ዳግም ያስጀምሩ እና መሣሪያ አውጣ"</string>
<string name="cope_provisioning_step_1_header" msgid="1945759718804756423">"የሥራ መተግበሪያዎች በየሥራ መገለጫዎ ውስጥ ይቀመጣሉ እና በአይቲ አስተዳዳሪዎ የሚተዳደሩ ናቸው"</string>
<string name="cope_provisioning_step_2_header" msgid="2388399739294883042">"የግል መተግበሪያዎች የተለዩ እና ከሥራ መተግበሪያዎች የተደበቁ ናቸው"</string>
<string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"የእርስዎ አይቲ አስተዳዳሪ ይህን መሣሪያ ሊቆጣጠር እና የተወሰኑ መተግበሪያዎችን ሊያግድ ይችላል"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f0e8827..ea290f0 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -56,12 +56,12 @@
<string name="encrypt" msgid="1749320161747489212">"এনক্ৰিপ্ট কৰক"</string>
<string name="continue_provisioning_notify_title" msgid="5191449100153186648">"এনক্ৰিপশ্বন সম্পূৰ্ণ হ’ল"</string>
<string name="continue_provisioning_notify_text" msgid="1066841819786425980">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ ছেটিং কাৰ্য অব্যাহত ৰাখিবলৈ ইয়াত টিপক"</string>
- <string name="managed_provisioning_error_text" msgid="7063621174570680890">"কৰ্মস্থানৰ প্ৰ\'ফাইল ছেটআপ কৰিব পৰা নগ\'ল। আপোনাৰ আইটি বিভাগৰ সৈতে যোগাযোগ কৰক বা পিছত পুনৰ চেষ্টা কৰক।"</string>
+ <string name="managed_provisioning_error_text" msgid="7063621174570680890">"কৰ্মস্থানৰ প্ৰ\'ফাইল ছেটআপ কৰিব পৰা নগ\'ল। আপোনাৰ আইটি বিভাগৰ সৈতে যোগাযোগ কৰক বা পাছত পুনৰ চেষ্টা কৰক।"</string>
<string name="cant_add_work_profile" msgid="9217268909964154934">"কৰ্মস্থানৰ প্ৰ\'ফাইল যোগ কৰিব নোৱাৰি"</string>
<string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"কৰ্মস্থানৰ প্ৰ\'ফাইল আঁতৰাব বা সলনি কৰিব নোৱাৰি"</string>
<string name="work_profile_cant_be_added_contact_admin" msgid="5393019630297157418">"এই ডিভাইচটোত কোনো কৰ্মস্থানৰ প্ৰ’ফাইল যোগ কৰিব নোৱাৰি। কিবা প্ৰশ্ন থাকিলে আপোনাৰ আইটি প্ৰশাসকৰ সৈতে যোগাযোগ কৰক৷"</string>
<string name="change_device_launcher" msgid="4523563368433637980">"ডিভাইচ লঞ্চাৰ সলনি কৰক"</string>
- <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলে এই লঞ্চাৰ এপটো ব্যৱহাৰ কৰিব নোৱাৰে"</string>
+ <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলে এই লঞ্চাৰ এপ্টো ব্যৱহাৰ কৰিব নোৱাৰে"</string>
<string name="cancel_provisioning" msgid="3408069559452653724">"বাতিল কৰক"</string>
<string name="pick_launcher" msgid="4257084827403983845">"ঠিক আছে"</string>
<string name="user_setup_incomplete" msgid="6494920045526591079">"ব্যৱহাৰকাৰীৰ ছেট আপ কার্য সম্পূর্ণ নহ\'ল"</string>
@@ -94,7 +94,7 @@
<string name="profile_owner_cancel_ok" msgid="5951679183850766029">"হয়"</string>
<string name="profile_owner_cancelling" msgid="5679573829145112822">"বাতিল কৰি থকা হৈছে…"</string>
<string name="work_profile_setup_later_title" msgid="9069148190226279892">"প্ৰ\'ফাইল ছেট আপ কার্য বন্ধ কৰিবনে?"</string>
- <string name="work_profile_setup_later_message" msgid="122069011117225292">"আপুনি পিছত আপোনাৰ প্ৰতিষ্ঠানৰ ডিভাইচ পৰিচালনা এপত আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইল ছেট আপ কৰিব পাৰিব"</string>
+ <string name="work_profile_setup_later_message" msgid="122069011117225292">"আপুনি পাছত আপোনাৰ প্ৰতিষ্ঠানৰ ডিভাইচ পৰিচালনা এপত আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইল ছেট আপ কৰিব পাৰিব"</string>
<string name="continue_button" msgid="7177918589510964446">"অব্যাহত ৰাখক"</string>
<string name="work_profile_setup_stop" msgid="6772128629992514750">"বন্ধ কৰক"</string>
<string name="dismiss" msgid="9009534756748565880">"অগ্ৰাহ্য কৰক"</string>
@@ -110,7 +110,7 @@
<string name="setup_isnt_finished_contact_admin" msgid="8849644190723875952">"ছেট আপ সম্পূৰ্ণ হোৱা নাই। সহায়ৰ বাবে আপোনাৰ আইটি প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
<string name="for_help_contact_admin" msgid="5922538077702487859">"সহায়ৰ বাবে আপোনাৰ আইটি প্ৰশাসকৰ সৈতে যোগাযোগ কৰক"</string>
<string name="organization_admin" msgid="5975914478148511290">"আইটি প্ৰশাসক"</string>
- <string name="your_org_app_used" msgid="5336414768293540831">"<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>এ এই ডিভাইচটো তলত উল্লেখ কৰা এপটো ব্যৱহাৰ কৰি পৰিচালনা আৰু পৰ্যবেক্ষণ কৰিব:"</string>
+ <string name="your_org_app_used" msgid="5336414768293540831">"<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>এ এই ডিভাইচটো তলত উল্লেখ কৰা এপ্টো ব্যৱহাৰ কৰি পৰিচালনা আৰু পৰ্যবেক্ষণ কৰিব:"</string>
<string name="your_organization_beginning" msgid="5952561489910967255">"আপোনাৰ প্ৰতিষ্ঠান"</string>
<string name="your_organization_middle" msgid="8288538158061644733">"আপোনাৰ প্ৰতিষ্ঠান"</string>
<string name="view_terms" msgid="7230493092383341605">"চৰ্তসমূহ চাওক"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 21c3456..b464144 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -42,7 +42,7 @@
<string name="navigation_button_description" msgid="6106309408994461239">"Idi nagore"</string>
<string name="terms" msgid="8295436105384703903">"Uslovi"</string>
<string name="work_profile_info" msgid="5433388376309583996">"Informacije o radnom profilu"</string>
- <string name="managed_device_info" msgid="1529447646526616811">"Podaci o upravljanom uređaju"</string>
+ <string name="managed_device_info" msgid="1529447646526616811">"Podaci o uređaju kojim se upravlja"</string>
<string name="default_managed_profile_name" msgid="5370257687074907055">"Poslovni profil"</string>
<string name="delete_profile_title" msgid="2841349358380849525">"Izbrisati postojeći profil?"</string>
<string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"Već imate radni profil kojim se upravlja putem ove aplikacije:"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 98efb62..3bf4560 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -36,7 +36,7 @@
<string name="contact_your_admin_for_more_info" msgid="9209568156969966347">"Contact your IT admin for more information, including your organization\'s privacy policies."</string>
<string name="learn_more_link" msgid="3012495805919550043">"Learn more"</string>
<string name="cancel_setup" msgid="2949928239276274745">"Cancel"</string>
- <string name="ok_setup" msgid="4593707675416137504">"OK"</string>
+ <string name="ok_setup" msgid="4593707675416137504">"Ok"</string>
<string name="user_consent_msg" msgid="8820951802130353584">"I consent"</string>
<string name="url_error" msgid="5958494012986243186">"This link cannot be displayed."</string>
<string name="navigation_button_description" msgid="6106309408994461239">"Navigate up"</string>
@@ -63,16 +63,16 @@
<string name="change_device_launcher" msgid="4523563368433637980">"Change device launcher"</string>
<string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"This launcher app can\'t be used by your work profile"</string>
<string name="cancel_provisioning" msgid="3408069559452653724">"Cancel"</string>
- <string name="pick_launcher" msgid="4257084827403983845">"OK"</string>
+ <string name="pick_launcher" msgid="4257084827403983845">"Ok"</string>
<string name="user_setup_incomplete" msgid="6494920045526591079">"User Setup Incomplete"</string>
<string name="default_owned_device_username" msgid="3915120202811807955">"User of work device"</string>
<string name="setup_work_device" msgid="6003988351437862369">"Setting up work device…"</string>
<string name="device_doesnt_allow_encryption_contact_admin" msgid="5124643338424539794">"This device doesn\'t allow encryption, which is needed for setup. For help, contact your IT admin."</string>
<string name="stop_setup_reset_device_question" msgid="7547191251522623210">"Stop setup & reset device?"</string>
<string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"This will reset your device and take you back to the first screen"</string>
- <string name="device_owner_cancel_message" msgid="2529288571742712065">"Stop setting up and delete your device\'s data?"</string>
+ <string name="device_owner_cancel_message" msgid="2529288571742712065">"Stop setting up and erase your device\'s data?"</string>
<string name="device_owner_cancel_cancel" msgid="1052951540909389275">"Cancel"</string>
- <string name="device_owner_error_ok" msgid="2002250763093787051">"OK"</string>
+ <string name="device_owner_error_ok" msgid="2002250763093787051">"Ok"</string>
<string name="reset" msgid="6467204151306265796">"Reset"</string>
<string name="cant_set_up_profile" msgid="4341825293970158436">"Can\'t set up profile"</string>
<string name="cant_set_up_device" msgid="4120090138983350714">"Can\'t set up device"</string>
@@ -92,7 +92,7 @@
<string name="profile_owner_cancel_message" msgid="6868736915633023477">"Stop setting up?"</string>
<string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"No"</string>
<string name="profile_owner_cancel_ok" msgid="5951679183850766029">"Yes"</string>
- <string name="profile_owner_cancelling" msgid="5679573829145112822">"Cancelling…"</string>
+ <string name="profile_owner_cancelling" msgid="5679573829145112822">"Canceling…"</string>
<string name="work_profile_setup_later_title" msgid="9069148190226279892">"Stop profile setup?"</string>
<string name="work_profile_setup_later_message" msgid="122069011117225292">"You can set up your work profile later in your organization\'s device management app"</string>
<string name="continue_button" msgid="7177918589510964446">"Continue"</string>
@@ -102,11 +102,11 @@
<string name="profile_owner_info_with_terms_headers" msgid="7373591910245655373">"You\'re about to create a work profile that\'ll be managed and monitored by your organization. Terms from <xliff:g id="TERMS_HEADERS">%1$s</xliff:g> will apply."</string>
<string name="profile_owner_info_comp" msgid="9190421701126119142">"A profile will be created for your work apps. This profile and the rest of your device will be managed and monitored by your organization. Terms will apply."</string>
<string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"A profile will be created for your work apps. This profile and the rest of your device will be managed and monitored by your organization. Terms from <xliff:g id="TERMS_HEADERS">%1$s</xliff:g> will apply."</string>
- <string name="device_owner_info" msgid="3716661456037934467">"This device will be managed, monitored and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms will apply. <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
- <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"This device will be managed, monitored and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms from <xliff:g id="TERMS_HEADERS">%2$s</xliff:g> will apply. <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
+ <string name="device_owner_info" msgid="3716661456037934467">"This device will be managed, monitored, and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms will apply. <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
+ <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"This device will be managed, monitored, and kept secure by <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g>. Terms from <xliff:g id="TERMS_HEADERS">%2$s</xliff:g> will apply. <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
<string name="link_isnt_secure_and_cant_be_opened_until_device_setup_finished" msgid="1604497932637832657">"This link isn\'t secure and can\'t be opened until device setup is finished: <xliff:g id="LINK_RAW_TEST">%1$s</xliff:g>"</string>
<string name="contact_device_provider" msgid="2843488903902493030">"To learn more, contact your <xliff:g id="IT_ADMIN">%1$s</xliff:g>."</string>
- <string name="if_questions_contact_admin" msgid="3509427015901582047">"If you have any questions, contact your IT admin"</string>
+ <string name="if_questions_contact_admin" msgid="3509427015901582047">"If you have questions, contact your IT admin"</string>
<string name="setup_isnt_finished_contact_admin" msgid="8849644190723875952">"Setup isn\'t finished. For help, contact your IT admin."</string>
<string name="for_help_contact_admin" msgid="5922538077702487859">"For help, contact your IT admin"</string>
<string name="organization_admin" msgid="5975914478148511290">"IT admin"</string>
@@ -117,10 +117,10 @@
<string name="accept_and_continue" msgid="1632679734918410653">"Accept & continue"</string>
<string name="back" msgid="6455622465896147127">"Back"</string>
<string name="set_up_your_device" msgid="1896651520959894681">"Set up your device"</string>
- <string name="info_anim_title_0" msgid="3285414600215959704">"Change the way that you work"</string>
+ <string name="info_anim_title_0" msgid="3285414600215959704">"Change the way you work"</string>
<string name="info_anim_title_1" msgid="2657512519467714760">"Separate work from personal"</string>
<string name="one_place_for_work_apps" msgid="2595597562302953960">"One place for work apps"</string>
- <string name="info_anim_title_2" msgid="4629781398620470204">"Turn off work when you\'ve finished"</string>
+ <string name="info_anim_title_2" msgid="4629781398620470204">"Turn off work when you\'re done"</string>
<string name="provisioning" msgid="4512493827019163451">"Provisioning"</string>
<string name="copying_certs" msgid="5697938664953550881">"Setting up CA certificates"</string>
<string name="setup_profile" msgid="5573950582159698549">"Set up your profile"</string>
@@ -165,35 +165,35 @@
<string name="work_profile_provisioning_step_2_header" msgid="6001172190404670248">"Pause work apps when you\'re done for the day"</string>
<string name="work_profile_provisioning_step_3_header" msgid="4316106639726774330">"Data in your work profile is visible to your IT admin"</string>
<string name="work_profile_provisioning_progress_label" msgid="2627905308998389193">"Setting up your work profile…"</string>
- <string name="work_profile_provisioning_summary" msgid="3436190271657388747">"Work apps are kept in your work profile. You can pause your work apps when you’ve finished for the day. The data in your work profile is visible to your IT admin."</string>
+ <string name="work_profile_provisioning_summary" msgid="3436190271657388747">"Work apps are kept in your work profile. You can pause your work apps when you’re done for the day. The data in your work profile is visible to your IT admin."</string>
<string name="fully_managed_device_provisioning_accept_header" msgid="2944032660440403130">"Let\'s set up your work device"</string>
<string name="fully_managed_device_provisioning_step_1_header" msgid="6396274703116708592">"Keep your work apps at your fingertips"</string>
<string name="fully_managed_device_provisioning_step_2_header" msgid="7165472083121590030">"This device isn\'t private"</string>
<string name="fully_managed_device_provisioning_step_2_subheader" msgid="2848998570491578119">"Your IT admin may be able to see your data and activity on this device."</string>
<string name="fully_managed_device_provisioning_permissions_header" msgid="2852101532084770993">"Your activity & data"</string>
<string name="fully_managed_device_provisioning_permissions_secondary_header" msgid="4419374850927705136">"App permissions"</string>
- <string name="fully_managed_device_provisioning_permissions_secondary_subheader" msgid="8328298923037335068">"Your IT admin can set permissions for apps on this device, such as microphone, camera and location permissions."</string>
+ <string name="fully_managed_device_provisioning_permissions_secondary_subheader" msgid="8328298923037335068">"Your IT admin can set permissions for apps on this device, such as microphone, camera, and location permissions."</string>
<string name="fully_managed_device_provisioning_progress_label" msgid="3925516135130021966">"Setting up your device…"</string>
<string name="fully_managed_device_provisioning_summary" msgid="1090645190066781456">"Use this device to easily access your work apps. This device isn\'t private, so your IT admin may be able to see your data and activity."</string>
- <string name="fully_managed_device_with_permission_control_provisioning_summary" msgid="6634797147105465856">"Use this device to easily access your work apps. This device isn’t private, so your IT admin may be able to see your activity and data. Your IT admin can also set permissions for apps on this device, such as microphone, camera and location permissions."</string>
+ <string name="fully_managed_device_with_permission_control_provisioning_summary" msgid="6634797147105465856">"Use this device to easily access your work apps. This device isn’t private, so your IT admin may be able to see your activity and data. Your IT admin can also set permissions for apps on this device, such as microphone, camera, and location permissions."</string>
<string name="fully_managed_device_provisioning_return_device_title" msgid="8500829014794276683">"Return this device to your IT admin"</string>
<string name="fully_managed_device_provisioning_return_device_subheader" msgid="6194410367910957686">"Go back to the previous screen, or reset this device and return it to your IT admin."</string>
<string name="fully_managed_device_cancel_setup_button" msgid="4910041382610777599">"Cancel setup"</string>
<string name="fully_managed_device_reset_and_return_button" msgid="6451125722998550681">"Reset & return device"</string>
- <string name="cope_provisioning_step_1_header" msgid="1945759718804756423">"Work apps are kept in your work profile and managed by your IT admin"</string>
- <string name="cope_provisioning_step_2_header" msgid="2388399739294883042">"Personal apps are separate and hidden from work apps"</string>
- <string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"Your IT admin can control this device and block certain apps"</string>
+ <string name="cope_provisioning_step_1_header" msgid="1945759718804756423">"Work apps are kept in your work profile & managed by your IT admin"</string>
+ <string name="cope_provisioning_step_2_header" msgid="2388399739294883042">"Personal apps are separate & hidden from work apps"</string>
+ <string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"Your IT admin can control this device & block certain apps"</string>
<string name="cope_provisioning_summary" msgid="993014104601034878">"Work apps are kept in your work profile and managed by your IT admin. Personal apps are separate and hidden from work apps. Your IT admin can control this device and block certain apps."</string>
<string name="just_a_sec" msgid="6244676028626237220">"Just a sec…"</string>
<string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"Privacy reminder"</string>
<string name="fully_managed_device_provisioning_privacy_body" msgid="2219074604343348608">"Your IT admin may be able to see your data and activity on this device"</string>
<string name="financed_device_screen_header" msgid="6875169548352717124">"This device is provided by <xliff:g id="CREDITOR_NAME">%s</xliff:g>"</string>
<string name="financed_make_payments_subheader_title" msgid="7880606710044254210">"Make payments for this device"</string>
- <string name="financed_make_payments_subheader_description" msgid="1222254084091306375">"<xliff:g id="CREDITOR_NAME_0">%1$s</xliff:g> can install the <xliff:g id="CREDITOR_NAME_1">%2$s</xliff:g> app so that you can make payments for this device."</string>
+ <string name="financed_make_payments_subheader_description" msgid="1222254084091306375">"<xliff:g id="CREDITOR_NAME_0">%1$s</xliff:g> can install the <xliff:g id="CREDITOR_NAME_1">%2$s</xliff:g> app so you can make payments for this device."</string>
<string name="financed_restrict_device_subheader_title" msgid="2138828664816418195">"This device can be restricted"</string>
- <string name="financed_restrict_device_subheader_description" msgid="5683975693718163300">"<xliff:g id="CREDITOR_NAME">%1$s</xliff:g> can restrict access to this device if you don\'t make payments."</string>
- <string name="error_role_holder_hash_mismatch" msgid="6201584198247885437">"Can\'t set up device. Contact your IT admin and reference \'Invalid checksum\'."</string>
+ <string name="financed_restrict_device_subheader_description" msgid="5683975693718163300">"<xliff:g id="CREDITOR_NAME">%1$s</xliff:g> can restrict access to this device if you dont make payments."</string>
+ <string name="error_role_holder_hash_mismatch" msgid="6201584198247885437">"Can\'t set up device. Contact your IT admin and reference \"Invalid checksum\"."</string>
<string name="error_role_holder_download_install_failed" msgid="8151968372180693228">"Try again later or ask your IT admin for help"</string>
- <string name="error_role_holder_package_invalid" msgid="2631207759497988833">"Can\'t set up device. Contact your IT admin and reference \'Missing or corrupted components\'."</string>
+ <string name="error_role_holder_package_invalid" msgid="2631207759497988833">"Can\'t set up device. Contact your IT admin and reference \"Missing or corrupted components\"."</string>
<string name="setting_up" msgid="1478847967385506664">"Setting up…"</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 1f2db13..8afe28a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -76,7 +76,7 @@
<string name="reset" msgid="6467204151306265796">"Berrezarri jatorrizko datuak"</string>
<string name="cant_set_up_profile" msgid="4341825293970158436">"Ezin da konfiguratu profila"</string>
<string name="cant_set_up_device" msgid="4120090138983350714">"Ezin da konfiguratu gailua"</string>
- <string name="something_went_wrong" msgid="3593223774041784329">"Arazo bat izan da"</string>
+ <string name="something_went_wrong" msgid="3593223774041784329">"Arazoren bat izan da"</string>
<string name="couldnt_set_up_device" msgid="5137950404283642302">"Ezin izan da konfiguratu gailua. Laguntza lortzeko, jarri IKT saileko administratzailearekin harremanetan."</string>
<string name="contact_your_admin_for_help" msgid="2009904021552323731">"Laguntza lortzeko, jarri IKT saileko administratzailearekin harremanetan"</string>
<string name="reset_device" msgid="5483853913241939262">"Berrezarri gailua eta saiatu berriro konfiguratzen"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1425a8e..fd6dd0f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -28,12 +28,12 @@
<string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"Келесі қолданба құрылғыңызды басқарады:"</string>
<string name="next" msgid="1004321437324424398">"Келесі"</string>
<string name="setting_up_workspace" msgid="7862472373642601041">"Жұмыс профилі реттелуде…"</string>
- <string name="admin_has_ability_to_monitor_profile" msgid="1018585795537086728">"Әкімші параметрлерді, корпоративтік ресурстарды пайдалануды, қолданбаларды, рұқсаттарды, деректерді және осы профильмен байланысты желідегі әрекеттерді, сондай-ақ қоңыраулар тарихы мен контактілерді іздеу тарихын бақылай және басқара алады. Қосымша ақпарат алу және ұйымның құпиялылық саясаттары туралы толығырақ білу үшін әкімшіге хабарласыңыз."</string>
+ <string name="admin_has_ability_to_monitor_profile" msgid="1018585795537086728">"Әкімші параметрлерді, корпоративтік ресурстарды пайдалануды, қолданбаларды, рұқсаттарды, деректерді және осы профильмен байланысты желідегі әрекеттерді, сондай-ақ қоңыраулар тарихы мен контактілерді іздеу тарихын бақылай және басқара алады. Қосымша ақпарат алу және ұйымның құпиялық саясаттары туралы толығырақ білу үшін әкімшіге хабарласыңыз."</string>
<string name="admin_has_ability_to_monitor_device" msgid="6303112630697870695">"Әкімші параметрлерді, корпоративтік ресурстарды пайдалануды, қолданбаларды, рұқсаттарды және осы құрылғымен байланысты деректерді, соның ішінде желідегі белсенділікті әрі құрылғының орналасқан жерін, қоңыраулар тарихын және контактілерді іздеу тарихын бақылай және басқара алады.<xliff:g id="LINE_BREAK">
-</xliff:g>Қосымша ақпаратты, соның ішінде ұйымның құпиялылық саясаттары туралы мәліметті алу үшін әкімшіге хабарласыңыз."</string>
+</xliff:g>Қосымша ақпаратты, соның ішінде ұйымның құпиялық саясаттары туралы мәліметті алу үшін әкімшіге хабарласыңыз."</string>
<string name="theft_protection_disabled_warning" msgid="3708092473574738478">"Ұрлықтан қорғау функцияларын пайдалану үшін, құрылғыда құпия сөзбен қорғалған экран құлпы болуы тиіс."</string>
- <string name="contact_your_admin_for_more_info" msgid="9209568156969966347">"Қосымша ақпаратты, соның ішінде ұйымның құпиялылық саясаттары туралы мәліметтер алу үшін әкімшіге хабарласыңыз."</string>
+ <string name="contact_your_admin_for_more_info" msgid="9209568156969966347">"Қосымша ақпаратты, соның ішінде ұйымның құпиялық саясаттары туралы мәліметтер алу үшін әкімшіге хабарласыңыз."</string>
<string name="learn_more_link" msgid="3012495805919550043">"Толығырақ"</string>
<string name="cancel_setup" msgid="2949928239276274745">"Бас тарту"</string>
<string name="ok_setup" msgid="4593707675416137504">"Жарайды"</string>
@@ -134,7 +134,7 @@
<string name="learn_more_label" msgid="2723716758654655009">"Толығырақ мәлімет түймесі"</string>
<string name="mdm_icon_label" msgid="3399134595549660561">"<xliff:g id="ICON_LABEL">%1$s</xliff:g> белгішесі"</string>
<string name="section_heading" msgid="3924666803774291908">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> бөлімінің тақырыбы."</string>
- <string name="section_content" msgid="8875502515704374394">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> бөлімінің мазмұны: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
+ <string name="section_content" msgid="8875502515704374394">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> бөлімінің контенті: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
<string name="expand" msgid="37188292156131304">"Жаю"</string>
<string name="collapse" msgid="7817530505064432580">"Жию"</string>
<string name="access_list_of_links" msgid="7094123315959323372">"Сілтемелер тізіміне кіру"</string>
@@ -185,7 +185,7 @@
<string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"Әкімші осы құрылғыны басқара алады және кейбір қолданбаларды бөгей алады."</string>
<string name="cope_provisioning_summary" msgid="993014104601034878">"Жұмыс қолданбалары жұмыс профилінде сақталады және оларды әкімші басқарады. Жеке қолданбалар жасырылған және жұмыс қолданбаларынан бөлек орналасқан. Әкімші осы құрылғыны басқара алады және кейбір қолданбаларды бөгей алады."</string>
<string name="just_a_sec" msgid="6244676028626237220">"Сәл күтіңіз…"</string>
- <string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"Құпиялылық туралы еске салғыш"</string>
+ <string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"Құпиялық туралы еске салғыш"</string>
<string name="fully_managed_device_provisioning_privacy_body" msgid="2219074604343348608">"Әкімші осы құрылғыдағы деректеріңізді және әрекеттеріңізді көруі мүмкін."</string>
<string name="financed_device_screen_header" msgid="6875169548352717124">"Бұл құрылғыны <xliff:g id="CREDITOR_NAME">%s</xliff:g> ұсынады"</string>
<string name="financed_make_payments_subheader_title" msgid="7880606710044254210">"Осы құрылғы арқылы төлемдер жасаңыз"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index bef8d2b..fe3652c 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -93,7 +93,7 @@
<string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"Жок"</string>
<string name="profile_owner_cancel_ok" msgid="5951679183850766029">"Ооба"</string>
<string name="profile_owner_cancelling" msgid="5679573829145112822">"Жокко чыгарылууда…"</string>
- <string name="work_profile_setup_later_title" msgid="9069148190226279892">"Профилди жөндөө токтотулсунбу?"</string>
+ <string name="work_profile_setup_later_title" msgid="9069148190226279892">"Профилди тууралоо токтотулсунбу?"</string>
<string name="work_profile_setup_later_message" msgid="122069011117225292">"Жумуш профилиңизди кийинчерээк ишканаңыздын түзмөктү башкаруучу колдонмосунан жөндөй аласыз"</string>
<string name="continue_button" msgid="7177918589510964446">"Улантуу"</string>
<string name="work_profile_setup_stop" msgid="6772128629992514750">"Токтотуу"</string>
@@ -123,7 +123,7 @@
<string name="info_anim_title_2" msgid="4629781398620470204">"Иштеп бүткөндөн кийин, жумуш профили өчүрүлөт"</string>
<string name="provisioning" msgid="4512493827019163451">"Демилгелөөдө"</string>
<string name="copying_certs" msgid="5697938664953550881">"CA тастыктамалары орнотулууда"</string>
- <string name="setup_profile" msgid="5573950582159698549">"Профилди жөндөө"</string>
+ <string name="setup_profile" msgid="5573950582159698549">"Профилди тууралоо"</string>
<string name="profile_benefits_description" msgid="758432985984252636">"Жумуш профилин колдонуу менен жумуш дайындарын жеке дайындардан ажырата аласыз"</string>
<string name="comp_profile_benefits_description" msgid="379837075456998273">"Жумуш профилин колдонуу менен, жумушка байланыштуу колдонмолорду бир жерде сактай аласыз"</string>
<string name="setup_profile_encryption" msgid="5241291404536277038">"Профилиңизди жөндөңүз. Шифрлөө"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0064c44..4bd726b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -81,7 +81,7 @@
<string name="contact_your_admin_for_help" msgid="2009904021552323731">"Kontakt IT-administratoren din for å få hjelp"</string>
<string name="reset_device" msgid="5483853913241939262">"Tilbakestill enheten og prøv å konfigurere den igjen"</string>
<string name="device_already_set_up" msgid="507881934487140294">"Enheten er allerede konfigurert"</string>
- <string name="error_wifi" msgid="1850288843966836571">"Kunne ikke koble til Wi-Fi"</string>
+ <string name="error_wifi" msgid="1850288843966836571">"Kunne ikke koble til wifi"</string>
<string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Beskyttelse mot tilbakestilling er slått på for enheten din. Ta kontakt med IT-administratoren din for å få hjelp."</string>
<string name="frp_clear_progress_title" msgid="8628074089458234965">"Sletter"</string>
<string name="frp_clear_progress_text" msgid="1740164332830598827">"Vent litt …"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b9bf497..47cce03 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -193,7 +193,7 @@
<string name="financed_restrict_device_subheader_title" msgid="2138828664816418195">"Este dispositivo pode ser restrito"</string>
<string name="financed_restrict_device_subheader_description" msgid="5683975693718163300">"<xliff:g id="CREDITOR_NAME">%1$s</xliff:g> pode restringir o acesso a este dispositivo se não efetuar pagamentos."</string>
<string name="error_role_holder_hash_mismatch" msgid="6201584198247885437">"Não é possível configurar o dispositivo. Contacte o administrador de TI e indique o motivo \"Soma de verificação inválida\"."</string>
- <string name="error_role_holder_download_install_failed" msgid="8151968372180693228">"Tente novamente mais tarde ou peça ajuda ao administrador de TI"</string>
+ <string name="error_role_holder_download_install_failed" msgid="8151968372180693228">"Tente mais tarde ou peça ajuda ao administrador de TI"</string>
<string name="error_role_holder_package_invalid" msgid="2631207759497988833">"Não é possível configurar o dispositivo. Contacte o administrador de TI e indique o motivo \"Componentes danificados ou em falta\"."</string>
<string name="setting_up" msgid="1478847967385506664">"A configurar…"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 58f89f2..d87a1ee 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -56,7 +56,7 @@
<string name="encrypt" msgid="1749320161747489212">"I-encrypt"</string>
<string name="continue_provisioning_notify_title" msgid="5191449100153186648">"Tapos na ang pag-encrypt"</string>
<string name="continue_provisioning_notify_text" msgid="1066841819786425980">"I-tap upang magpatuloy sa pagse-set up ng iyong profile sa trabaho"</string>
- <string name="managed_provisioning_error_text" msgid="7063621174570680890">"Hindi ma-set up ang iyong profile sa trabaho. Makipag-ugnayan sa iyong IT department o subukang muli sa ibang pagkakataon."</string>
+ <string name="managed_provisioning_error_text" msgid="7063621174570680890">"Hindi ma-set up ang iyong profile sa trabaho. Makipag-ugnayan sa iyong IT department o subukan ulit sa ibang pagkakataon."</string>
<string name="cant_add_work_profile" msgid="9217268909964154934">"Hindi maidagdag ang profile sa trabaho"</string>
<string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"Hindi maaaring palitan o alisin ang profile sa trabaho"</string>
<string name="work_profile_cant_be_added_contact_admin" msgid="5393019630297157418">"Hindi makapagdagdag ng profile sa trabaho sa device na ito. Kung mayroon kang mga tanong, makipag-ugnayan sa iyong IT admin."</string>
diff --git a/src/com/android/managedprovisioning/task/InstallPackageTask.java b/src/com/android/managedprovisioning/task/InstallPackageTask.java
index 92553ca..c81012d 100644
--- a/src/com/android/managedprovisioning/task/InstallPackageTask.java
+++ b/src/com/android/managedprovisioning/task/InstallPackageTask.java
@@ -69,6 +69,7 @@
private final PackageInstaller.SessionCallback mSessionCallback = new SessionCallback();
private final String mPackageName;
private final Utils mUtils;
+ private int mSessionId = -1;
private static final int SUCCESS_INSTALLED_BROADCAST = 1;
private static final int SUCCESS_INSTALLED_CALLBACK = 2;
@@ -162,7 +163,16 @@
packageLocation.delete();
}
}
-
+ /*
+ The reason why we have both SessionCallback and BroadcastReceiver is as follows:
+ Initially we were just listening for the ACTION_INSTALL_DONE broadcast
+ but this was being received too early causing the bug(b/185897624).
+ In (ag/14971042) we reworked the logic to register for session callback,
+ it still ran into the race condition(b/165012101) causing the bug(b/15160090)
+ But it was still fine to keep that logic since it's the recommended approach.
+ In current state(ag/15160090), we've now added Intent#ACTION_PACKAGE_ADDED receiver
+ as that's the latest possible callback.
+ */
private void installPackage(
File source,
String packageName,
@@ -175,8 +185,8 @@
new PackageAddedReceiver(packageName),
createPackageAddedIntentFilter());
pi.registerSessionCallback(sessionCallback);
- int sessionId = pi.createSession(params);
- try (PackageInstaller.Session session = pi.openSession(sessionId)) {
+ mSessionId = pi.createSession(params);
+ try (PackageInstaller.Session session = pi.openSession(mSessionId)) {
try (FileInputStream in = new FileInputStream(source);
OutputStream out = session.openWrite(source.getName(), 0, -1)) {
copyStream(in, out);
@@ -185,10 +195,10 @@
throw e;
}
- String action = ACTION_INSTALL_DONE + sessionId;
+ String action = ACTION_INSTALL_DONE + mSessionId;
PendingIntent pendingIntent = PendingIntent.getBroadcast(
context,
- sessionId,
+ mSessionId,
new Intent(action),
FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT | FLAG_MUTABLE);
session.commit(pendingIntent.getIntentSender());
@@ -258,6 +268,9 @@
@Override
public void onFinished(int sessionId, boolean success) {
+ if (sessionId != mSessionId) {
+ return;
+ }
PackageInstaller packageInstaller = mPm.getPackageInstaller();
packageInstaller.unregisterSessionCallback(mSessionCallback);
if (!success) {