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

Commit e8350122 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 530fcce7: am 4df901a4: am 7cd3e905: Merge "Drop <meta-data> support for... 

am 530fcce7: am 4df901a4: am 7cd3e905: Merge "Drop <meta-data> support for DocumentsProviders." into klp-dev

* commit '530fcce7':
  Drop <meta-data> support for DocumentsProviders.
parents b44c4439 530fcce7

core/java/android/provider/DocumentsContract.java

+8 −11
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ import android.content.ContentProviderClient; 
import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ProviderInfo;

import android.content.res.AssetFileDescriptor;

import android.content.res.AssetFileDescriptor;

import android.database.Cursor;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.Bitmap;
@@ -69,10 +68,6 @@ public final class DocumentsContract { 
    private DocumentsContract() {

    private DocumentsContract() {

    }

    }





    /** {@hide} */

    @Deprecated

    public static final String META_DATA_DOCUMENT_PROVIDER = "android.content.DOCUMENT_PROVIDER";



    /**

    /**

     * Intent action used to identify {@link DocumentsProvider} instances.

     * Intent action used to identify {@link DocumentsProvider} instances.

     */

     */
@@ -565,12 +560,14 @@ public final class DocumentsContract { 
            return false;

            return false;

        }

        }





        final ProviderInfo info = context.getPackageManager()

        final Intent intent = new Intent(PROVIDER_INTERFACE);

                .resolveContentProvider(uri.getAuthority(), PackageManager.GET_META_DATA);

        final List<ResolveInfo> infos = context.getPackageManager()

        if (info != null && info.metaData != null && info.metaData.containsKey(

                .queryIntentContentProviders(intent, 0);

                DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) {

        for (ResolveInfo info : infos) {

            if (uri.getAuthority().equals(info.providerInfo.authority)) {

                return true;

                return true;

            }

            }

        }

        return false;

        return false;

    }

    }

packages/DocumentsUI/src/com/android/documentsui/RootsCache.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -194,16 +194,6 @@ public class RootsCache { 
                handleDocumentsProvider(info.providerInfo);

                handleDocumentsProvider(info.providerInfo);

            }

            }





            // Pick up legacy providers

            final List<ProviderInfo> legacyProviders = pm.queryContentProviders(

                    null, -1, PackageManager.GET_META_DATA);

            for (ProviderInfo info : legacyProviders) {

                if (info.metaData != null && info.metaData.containsKey(

                        DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) {

                    handleDocumentsProvider(info);

                }

            }



            final long delta = SystemClock.elapsedRealtime() - start;

            final long delta = SystemClock.elapsedRealtime() - start;

            Log.d(TAG, "Update found " + mTaskRoots.size() + " roots in " + delta + "ms");

            Log.d(TAG, "Update found " + mTaskRoots.size() + " roots in " + delta + "ms");

            synchronized (mLock) {

            synchronized (mLock) {