Snap for 8183220 from 46462910f634abe0e91f3591cc7e504fd5f4f9c7 to mainline-adbd-releaseandroid-mainline-12.0.0_r97android-mainline-12.0.0_r85android12-mainline-adbd-release

Change-Id: Iff59b420ff3a01bf8a47a6e95cfaaa9e6790dc5d

9 files changed, 31 insertions, 18 deletions

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 821157a41..2bfd428e8 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -144,7 +144,7 @@
       <item quantity="other">ဖိုင်<xliff:g id="COUNT_1">%1$d</xliff:g> ဖိုင်ကို ဖျက်နေသည်။</item>
       <item quantity="one">ဖိုင်<xliff:g id="COUNT_0">%1$d</xliff:g> ဖိုင်ကို ဖျက်နေသည်။</item>
     </plurals>
-    <string name="undo" msgid="2902438994196400565">"တစ်ဆင့်နောက်ပြန်ပါ"</string>
+    <string name="undo" msgid="2902438994196400565">"နောက်ပြန်ရန်"</string>
     <string name="copy_preparing" msgid="4759516490222449324">"အသင့်ပြင်နေပါသည်..."</string>
     <string name="compress_preparing" msgid="7401605598969019696">"အသင့်ပြင်နေပါသည်..."</string>
     <string name="extract_preparing" msgid="4796626960061745796">"အသင့်ပြင်နေပါသည်..."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 149e6b0a1..3aae485c7 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -40,7 +40,7 @@
     <string name="menu_select_all" msgid="7600576812185570403">"Selecionar tudo"</string>
     <string name="menu_deselect_all" msgid="7729916068862742979">"Desmarcar tudo"</string>
     <string name="menu_select" msgid="1366061076507142387">"Selecionar"</string>
-    <string name="menu_sort" msgid="3362419226163725275">"Classificar por…"</string>
+    <string name="menu_sort" msgid="3362419226163725275">"Ordenar por…"</string>
     <string name="menu_copy" msgid="7404820171352314754">"Copiar para..."</string>
     <string name="menu_move" msgid="2310760789561129882">"Mover para…"</string>
     <string name="menu_compress" msgid="37539111904724188">"Compactar"</string>
@@ -81,7 +81,7 @@
     <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Tipo (Z a A)"</string>
     <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Tamanho (maior primeiro)"</string>
     <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Modificado (mais recente primeiro)"</string>
-    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Classificar por"</string>
+    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Ordenar por"</string>
     <string name="sort_dimension_button_title" msgid="1898606989130896126">"Classificado por <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="directory_items" msgid="6645621978998614003">"Número de itens"</string>
     <string name="sort_direction_ascending" msgid="5882787683763248102">"Crescente"</string>
@@ -203,7 +203,7 @@
     <string name="menu_eject_root" msgid="9215040039374893613">"Ejetar"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Alguns arquivos foram convertidos"</string>
     <string name="open_external_dialog_request" msgid="8173558471322861268">"Conceder ao <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
-    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Conceder acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> para <xliff:g id="APPNAME"><b>^1</b></xliff:g>?"</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Permitir acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> para <xliff:g id="APPNAME"><b>^1</b></xliff:g>?"</string>
     <string name="open_external_dialog_root_request" msgid="6776729293982633">"Conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso aos seus dados, incluindo fotos e vídeos, no/na <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
     <string name="allow" msgid="1275746941353040309">"Permitir"</string>
     <string name="deny" msgid="5127201668078153379">"Negar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 149e6b0a1..3aae485c7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -40,7 +40,7 @@
     <string name="menu_select_all" msgid="7600576812185570403">"Selecionar tudo"</string>
     <string name="menu_deselect_all" msgid="7729916068862742979">"Desmarcar tudo"</string>
     <string name="menu_select" msgid="1366061076507142387">"Selecionar"</string>
-    <string name="menu_sort" msgid="3362419226163725275">"Classificar por…"</string>
+    <string name="menu_sort" msgid="3362419226163725275">"Ordenar por…"</string>
     <string name="menu_copy" msgid="7404820171352314754">"Copiar para..."</string>
     <string name="menu_move" msgid="2310760789561129882">"Mover para…"</string>
     <string name="menu_compress" msgid="37539111904724188">"Compactar"</string>
@@ -81,7 +81,7 @@
     <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Tipo (Z a A)"</string>
     <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Tamanho (maior primeiro)"</string>
     <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Modificado (mais recente primeiro)"</string>
-    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Classificar por"</string>
+    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Ordenar por"</string>
     <string name="sort_dimension_button_title" msgid="1898606989130896126">"Classificado por <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="directory_items" msgid="6645621978998614003">"Número de itens"</string>
     <string name="sort_direction_ascending" msgid="5882787683763248102">"Crescente"</string>
@@ -203,7 +203,7 @@
     <string name="menu_eject_root" msgid="9215040039374893613">"Ejetar"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Alguns arquivos foram convertidos"</string>
     <string name="open_external_dialog_request" msgid="8173558471322861268">"Conceder ao <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
-    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Conceder acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> para <xliff:g id="APPNAME"><b>^1</b></xliff:g>?"</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Permitir acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> para <xliff:g id="APPNAME"><b>^1</b></xliff:g>?"</string>
     <string name="open_external_dialog_root_request" msgid="6776729293982633">"Conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso aos seus dados, incluindo fotos e vídeos, no/na <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
     <string name="allow" msgid="1275746941353040309">"Permitir"</string>
     <string name="deny" msgid="5127201668078153379">"Negar"</string>
diff --git a/res/values-sv/inspector_strings.xml b/res/values-sv/inspector_strings.xml
index c63d3b59f..b37c48977 100644
--- a/res/values-sv/inspector_strings.xml
+++ b/res/values-sv/inspector_strings.xml
@@ -34,7 +34,7 @@
     <string name="metadata_camera_format" msgid="1494489751904311612">"<xliff:g id="MAKE">%1$s</xliff:g> <xliff:g id="MODEL">%2$s</xliff:g>"</string>
     <string name="metadata_aperture" msgid="6538741952698935357">"Bländare"</string>
     <string name="metadata_shutter_speed" msgid="8204739885103326131">"Slutarhastighet"</string>
-    <string name="metadata_duration" msgid="3115494422055472715">"Varaktighet"</string>
+    <string name="metadata_duration" msgid="3115494422055472715">"Längd"</string>
     <string name="metadata_date_time" msgid="1090351199248114406">"Taget den"</string>
     <string name="metadata_focal_length" msgid="3440735161407699893">"Brännvidd"</string>
     <string name="metadata_focal_format" msgid="8542211707962355623">"<xliff:g id="LENGTH">%1$.2f </xliff:g> mm"</string>
diff --git a/res/values-ta/inspector_strings.xml b/res/values-ta/inspector_strings.xml
index 865765790..9d6b5012d 100644
--- a/res/values-ta/inspector_strings.xml
+++ b/res/values-ta/inspector_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="inspector_title" msgid="1924760928091740238">"தகவல்"</string>
-    <string name="inspector_load_error" msgid="7522190243413249291">"கோப்புத் தகவலை ஏற்ற முடியவில்லை"</string>
+    <string name="inspector_load_error" msgid="7522190243413249291">"ஃபைல் தகவலை ஏற்ற முடியவில்லை"</string>
     <string name="inspector_debug_section" msgid="2576052661505700421">"பிழைத்திருத்தத் தகவல் (டெவெலப்பர்கள் மட்டும்)"</string>
     <string name="inspector_debug_metadata_section" msgid="5875140675600744846">"அசல் மீத்தரவு: <xliff:g id="METADATATYPE">%1$s</xliff:g>"</string>
     <string name="inspector_metadata_section" msgid="6077622515328240575">"மீடியா விவரங்கள்"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 01a5bbd31..b238e78d0 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -112,7 +112,7 @@
     <string name="root_type_apps" msgid="8646073235029886342">"மேலும் ஆப்ஸ்"</string>
     <string name="empty" msgid="5300254272613103004">"எதுவும் இல்லை"</string>
     <string name="no_results" msgid="2371026325236359209">"%1$s இல் பொருந்தும் முடிவு இல்லை"</string>
-    <string name="toast_no_application" msgid="7555319548595113121">"கோப்பைத் திறக்க முடியாது"</string>
+    <string name="toast_no_application" msgid="7555319548595113121">"ஃபைலைத் திறக்க முடியாது"</string>
     <string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"காப்பகங்களில் உள்ள ஃபைல்களைத் திறக்க முடியாது"</string>
     <string name="toast_failed_delete" msgid="3453846588205817591">"சில ஆவணங்களை நீக்க முடியவில்லை"</string>
     <string name="toast_share_over_limit" msgid="5805442886537093015">"<xliff:g id="COUNT">%1$d</xliff:g> ஃபைல்களுக்கு மேல் பகிர முடியாது"</string>
@@ -197,8 +197,8 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ஃபைல்கள் , கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டன.</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ஃபைல், கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது.</item>
     </plurals>
-    <string name="file_operation_rejected" msgid="4301554203329008794">"கோப்புச் செயல்பாடு ஆதரிக்கப்படவில்லை."</string>
-    <string name="file_operation_error" msgid="2234357335716533795">"கோப்புச் செயல்பாடு தோல்வியடைந்தது."</string>
+    <string name="file_operation_rejected" msgid="4301554203329008794">"ஃபைல் செயல்பாடு ஆதரிக்கப்படவில்லை."</string>
+    <string name="file_operation_error" msgid="2234357335716533795">"ஃபைல் செயல்பாடு தோல்வியடைந்தது."</string>
     <string name="rename_error" msgid="6700093173508118635">"ஆவணத்தின் பெயரை மாற்ற முடியவில்லை"</string>
     <string name="menu_eject_root" msgid="9215040039374893613">"வெளியேற்று"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"சில ஃபைல்கள்  மாற்றப்பட்டன"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 071162ef9..35487aa96 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -72,7 +72,7 @@
     <string name="sort_dimension_summary" msgid="7724534446881397860">"సారాంశం"</string>
     <string name="sort_dimension_file_type" msgid="5779709622922085381">"రకం"</string>
     <string name="sort_dimension_size" msgid="2190547351159472884">"సైజ్‌"</string>
-    <string name="sort_dimension_date" msgid="4231005651895254033">"సవరించిన సమయం"</string>
+    <string name="sort_dimension_date" msgid="4231005651895254033">"ఎడిట్ చేసిన సమయం"</string>
     <string name="sort_dimension_name_ascending" msgid="3715725253270614742">"ఫైల్ పేరు (A నుండి Zకు)"</string>
     <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"రకం (A నుండి Z)"</string>
     <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"పరిమాణం (మొదట చిన్నవి)"</string>
@@ -89,7 +89,7 @@
     <string name="open_external_app" msgid="7107920381038980086">"<xliff:g id="APPNAME">%1$s</xliff:g>ని తెరువు"</string>
     <string name="drawer_open" msgid="8071673398187261741">"మూలాలను చూపు"</string>
     <string name="drawer_close" msgid="4263880768630848848">"మూలాలను దాచు"</string>
-    <string name="save_error" msgid="8631128801982095782">"పత్రాన్ని సేవ్ చేయడంలో విఫలమైంది"</string>
+    <string name="save_error" msgid="8631128801982095782">"డాక్యుమెంట్‌ను సేవ్ చేయడంలో విఫలమైంది"</string>
     <string name="create_error" msgid="3092144450044861994">"ఫోల్డర్‌ను సృష్టించడంలో విఫలమైంది"</string>
     <string name="query_error" msgid="6625421453613879336">"ఈ సమయంలో కంటెంట్‌ను లోడ్ చేయడం సాధ్యపడదు"</string>
     <string name="quiet_mode_error_title" msgid="554319751414657910">"వర్క్ యాప్‌లు పాజ్ చేయబడ్డాయి"</string>
@@ -114,7 +114,7 @@
     <string name="no_results" msgid="2371026325236359209">"%1$sలో సరిపోలినవి లేవు"</string>
     <string name="toast_no_application" msgid="7555319548595113121">"ఫైల్‌ను తెరవడం సాధ్యపడదు"</string>
     <string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"ఆర్కైవ్‌లలో ఉన్న ఫైళ్లను తెరవడం సాధ్యం కాదు"</string>
-    <string name="toast_failed_delete" msgid="3453846588205817591">"కొన్ని పత్రాలను తొలగించడం సాధ్యపడలేదు"</string>
+    <string name="toast_failed_delete" msgid="3453846588205817591">"కొన్ని డాక్యుమెంట్‌లను తొలగించడం సాధ్యపడలేదు"</string>
     <string name="toast_share_over_limit" msgid="5805442886537093015">"<xliff:g id="COUNT">%1$d</xliff:g> ఫైళ్ల కంటే ఎక్కువ షేర్ చేయలేరు"</string>
     <string name="toast_action_not_allowed" msgid="1329382474450572415">"చర్యకు అనుమతి లేదు"</string>
     <string name="share_via" msgid="8725082736005677161">"దీనితో షేర్ చేయండి"</string>
@@ -199,7 +199,7 @@
     </plurals>
     <string name="file_operation_rejected" msgid="4301554203329008794">"ఫైల్ చర్యకు మద్దతు లేదు."</string>
     <string name="file_operation_error" msgid="2234357335716533795">"ఫైల్ చర్య విఫలమైంది."</string>
-    <string name="rename_error" msgid="6700093173508118635">"పత్రం పేరు మార్చడంలో విఫలమైంది"</string>
+    <string name="rename_error" msgid="6700093173508118635">"డాక్యుమెంట్‌ పేరు మార్చడంలో విఫలమైంది"</string>
     <string name="menu_eject_root" msgid="9215040039374893613">"తీసివేయి"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"కొన్ని పైల్‌లు మార్చబడ్డాయి"</string>
     <string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="STORAGE"><i>^3</i></xliff:g>లో <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ యాక్సెస్‌ను మంజూరు చేయాలా?"</string>
@@ -234,7 +234,7 @@
     <string name="name_conflict" msgid="28407269328862986">"ఈ పేరుతో ఇప్పటికే ఒక ఫైల్ ఉంది."</string>
     <string name="authentication_required" msgid="8030880723643436099">"ఈ డైరెక్టరీని వీక్షించాలంటే, <xliff:g id="NAME">%1$s</xliff:g>కి సైన్ ఇన్ చేయండి"</string>
     <string name="cant_display_content" msgid="8633226333229417237">"కంటెంట్‌లను ప్రదర్శించడం సాధ్యం కాదు"</string>
-    <string name="sign_in" msgid="6253762676723505592">"సైన్ ఇన్ చేయి"</string>
+    <string name="sign_in" msgid="6253762676723505592">"సైన్ ఇన్ చేయండి"</string>
     <string name="new_archive_file_name" msgid="1604650338077249838">"ఆర్కైవ్ చేయి<xliff:g id="EXTENSION">%s</xliff:g>"</string>
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"<xliff:g id="NAME">%1$s</xliff:g>ని భర్తీ చేయాలా?"</string>
     <string name="continue_in_background" msgid="1974214559047793331">"నేపథ్యంలో కొనసాగించు"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 51fda4614..cbb702c80 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -275,7 +275,7 @@
     <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Để bảo vệ quyền riêng tư của bạn, hãy chọn một thư mục khác"</string>
     <string name="create_new_folder_button" msgid="8859613309559794890">"Tạo thư mục mới"</string>
     <string name="search_bar_hint" msgid="4517366509897977321">"Tìm kiếm trên điện thoại này"</string>
-    <string name="delete_search_history" msgid="2202015025607694515">"Xóa lịch sử tìm kiếm <xliff:g id="TEXT">%1$s</xliff:g>"</string>
+    <string name="delete_search_history" msgid="2202015025607694515">"Xoá nhật ký tìm kiếm <xliff:g id="TEXT">%1$s</xliff:g>"</string>
     <string name="personal_tab" msgid="3878576287868528503">"Cá nhân"</string>
     <string name="work_tab" msgid="7265359366883747413">"Công việc"</string>
     <string name="a11y_work" msgid="7504431382825242153">"Công việc"</string>
diff --git a/src/com/android/documentsui/picker/ActionHandler.java b/src/com/android/documentsui/picker/ActionHandler.java
index 53a285110..cc349a854 100644
--- a/src/com/android/documentsui/picker/ActionHandler.java
+++ b/src/com/android/documentsui/picker/ActionHandler.java
@@ -62,9 +62,12 @@ import com.android.documentsui.queries.SearchViewManager;
 import com.android.documentsui.roots.ProvidersAccess;
 import com.android.documentsui.services.FileOperationService;
 
+import com.android.documentsui.util.VersionUtils;
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.concurrent.Executor;
 
+import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 
 /**
@@ -78,6 +81,8 @@ class ActionHandler<T extends FragmentActivity & Addons> extends AbstractActionH
     private final ActivityConfig mConfig;
     private final LastAccessedStorage mLastAccessed;
     private final UserIdManager mUserIdManager;
+    private final static Pattern PATTERN_BLOCK_PATH = Pattern.compile(
+        ".*:android\\/(?:data|obb|sandbox)$");
 
     private UpdatePickResultTask mUpdatePickResultTask;
 
@@ -157,6 +162,14 @@ class ActionHandler<T extends FragmentActivity & Addons> extends AbstractActionH
     private boolean launchToInitialUri(Intent intent) {
         Uri uri = intent.getParcelableExtra(DocumentsContract.EXTRA_INITIAL_URI);
         if (uri != null) {
+            // In android S and above if path contains Android/data, Android/obb
+            // or Android/sandbox redirect to the root for which
+            // FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE is already set
+            if(Shared.shouldRestrictStorageAccessFramework(mActivity)
+                && (PATTERN_BLOCK_PATH.matcher(uri.getPath().toLowerCase(Locale.ROOT)).matches())){
+                loadDeviceRoot();
+                return true;
+            }
             if (DocumentsContract.isRootUri(mActivity, uri)) {
                 loadRoot(uri, UserId.DEFAULT_USER);
                 return true;