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

Commit d606d52a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4557233 from 4a0c3bb3 to pi-release 

Change-Id: I27423af48162e46d1531a7a90e9b9386090e7f3d
parents d2811ebb 4a0c3bb3

res/values-nb/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
    <string name="button_compress" msgid="8951561310857223966">"Komprimer"</string>

    <string name="button_extract" msgid="1038674453689912247">"Pakk ut"</string>

    <string name="button_move" msgid="8596460499325291272">"Flytt"</string>

    <string name="button_dismiss" msgid="7235249361023803349">"Avvis"</string>

    <string name="button_dismiss" msgid="7235249361023803349">"Lukk"</string>

    <string name="button_retry" msgid="4011461781916631389">"Prøv på nytt"</string>

    <string name="button_clear" msgid="5412304437764369441">"Fjern"</string>

    <string name="button_show_provider" msgid="6905880493806292753">"Vis i leverandøren"</string>

res/values-sw/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -204,6 +204,6 @@ 
    <string name="cant_display_content" msgid="8633226333229417237">"Imeshindwa kuonyesha maudhui"</string>

    <string name="sign_in" msgid="6253762676723505592">"Ingia katika akaunti"</string>

    <string name="new_archive_file_name" msgid="1604650338077249838">"weka <xliff:g id="EXTENSION">%s</xliff:g> kwenye kumbukumbu"</string>

    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Ungependa kufuta <xliff:g id="NAME">%1$s</xliff:g>?"</string>

    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Ungependa kubadili <xliff:g id="NAME">%1$s</xliff:g>?"</string>

    <string name="continue_in_background" msgid="1974214559047793331">"Endelea shughuli chini chini"</string>

</resources>

src/com/android/documentsui/roots/ProvidersCache.java

+19 −3
Original line number Diff line number Diff line
@@ -240,10 +240,27 @@ public class ProvidersCache implements ProvidersAccess { 
            ContentResolver resolver, String authority, boolean forceRefresh) {

        if (VERBOSE) Log.v(TAG, "Loading roots for " + authority);



        synchronized (mObservedAuthoritiesDetails) {

            if (!mObservedAuthoritiesDetails.containsKey(authority)) {

        final ArrayList<RootInfo> roots = new ArrayList<>();

        ProviderInfo provider = mContext.getPackageManager().resolveContentProvider(

                authority, PackageManager.GET_META_DATA);

        if (!provider.exported) {

            Log.w(TAG, "Provider is not exported. Failed to load roots for " + authority);

            return roots;

        }

        if (!provider.grantUriPermissions) {

            Log.w(TAG, "Provider doesn't grantUriPermissions. Failed to load roots for "

                    + authority);

            return roots;

        }

        if (!android.Manifest.permission.MANAGE_DOCUMENTS.equals(provider.readPermission)

                || !android.Manifest.permission.MANAGE_DOCUMENTS.equals(provider.writePermission)) {

            Log.w(TAG, "Provider is not protected by MANAGE_DOCUMENTS. Failed to load roots for "

                    + authority);

            return roots;

        }



        synchronized (mObservedAuthoritiesDetails) {

            if (!mObservedAuthoritiesDetails.containsKey(authority)) {

                PackageManager pm = mContext.getPackageManager();

                CharSequence appName = pm.getApplicationLabel(provider.applicationInfo);

                String packageName = provider.applicationInfo.packageName;
@@ -274,7 +291,6 @@ public class ProvidersCache implements ProvidersAccess { 
            }

        }



        final ArrayList<RootInfo> roots = new ArrayList<>();

        ContentProviderClient client = null;

        Cursor cursor = null;

        try {