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

Commit 85f5f813 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Add <intent-filter> support to <provider>. 

For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
parent ca25db0c

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -7249,6 +7249,7 @@ package android.content.pm { 
    method public abstract java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(java.lang.String, int);

    method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(android.content.Intent, int);

    method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int);

    method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);

    method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);

    method public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract deprecated void removePackageFromPreferred(java.lang.String);
@@ -7413,6 +7414,7 @@ package android.content.pm { 
    ctor public ProviderInfo();

    ctor public ProviderInfo(android.content.pm.ProviderInfo);

    method public int describeContents();

    method public void dump(android.util.Printer, java.lang.String);

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

    field public java.lang.String authority;
@@ -7446,6 +7448,7 @@ package android.content.pm { 
    field public java.lang.CharSequence nonLocalizedLabel;

    field public int preferredOrder;

    field public int priority;

    field public android.content.pm.ProviderInfo providerInfo;

    field public java.lang.String resolvePackageName;

    field public android.content.pm.ServiceInfo serviceInfo;

    field public int specificIndex;
@@ -20987,6 +20990,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_ERROR = "error";

    field public static final java.lang.String EXTRA_INFO = "info";

    field public static final java.lang.String EXTRA_LOADING = "loading";

    field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";

  }















  public static final class DocumentsContract.Document {










@@ -24482,6 +24486,7 @@ package android.test.mock {













    method public java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(java.lang.String, int);















    method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(android.content.Intent, int);















    method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int);













    method public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);















    method public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);















    method public java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;















    method public void removePackageFromPreferred(java.lang.String);

























core/java/android/app/ApplicationPackageManager.java



+16
−0




























Original line number
Diff line number
Diff line








@@ -584,6 +584,22 @@ final class ApplicationPackageManager extends PackageManager {













        return queryIntentServicesAsUser(intent, flags, mContext.getUserId());















    }





























    @Override













    public List<ResolveInfo> queryIntentContentProvidersAsUser(













            Intent intent, int flags, int userId) {













        try {













            return mPM.queryIntentContentProviders(intent,













                    intent.resolveTypeIfNeeded(mContext.getContentResolver()), flags, userId);













        } catch (RemoteException e) {













            throw new RuntimeException("Package manager has died", e);













        }













    }



























    @Override













    public List<ResolveInfo> queryIntentContentProviders(Intent intent, int flags) {













        return queryIntentContentProvidersAsUser(intent, flags, mContext.getUserId());













    }





























    @Override















    public ProviderInfo resolveContentProvider(String name,















                                               int flags) {

































core/java/android/content/pm/IPackageManager.aidl



+3
−0




























Original line number
Diff line number
Diff line








@@ -123,6 +123,9 @@ interface IPackageManager {













    List<ResolveInfo> queryIntentServices(in Intent intent,















            String resolvedType, int flags, int userId);





























    List<ResolveInfo> queryIntentContentProviders(in Intent intent,













            String resolvedType, int flags, int userId);





























    /**















     * This implements getInstalledPackages via a "last returned row"















     * mechanism that is not exposed in the API. This is to get around the IPC

































core/java/android/content/pm/PackageManager.java



+18
−0




























Original line number
Diff line number
Diff line








@@ -2202,6 +2202,24 @@ public abstract class PackageManager {













    public abstract List<ResolveInfo> queryIntentServicesAsUser(Intent intent,















            int flags, int userId);





























    /** {@hide} */













    public abstract List<ResolveInfo> queryIntentContentProvidersAsUser(













            Intent intent, int flags, int userId);



























    /**













     * Retrieve all providers that can match the given intent.













     *













     * @param intent An intent containing all of the desired specification













     *            (action, data, type, category, and/or component).













     * @param flags Additional option flags.













     * @return A List&lt;ResolveInfo&gt; containing one entry for each matching













     *         ProviderInfo. These are ordered from best to worst match. If













     *         there are no matching providers, an empty list is returned.













     * @see #GET_INTENT_FILTERS













     * @see #GET_RESOLVED_FILTER













     */













    public abstract List<ResolveInfo> queryIntentContentProviders(Intent intent, int flags);





























    /**















     * Find a single content provider by its base path name.















     *

































core/java/android/content/pm/PackageParser.java



+27
−2




























Original line number
Diff line number
Diff line








@@ -2819,7 +2819,14 @@ public class PackageParser {













                continue;















            }





























            if (parser.getName().equals("meta-data")) {













            if (parser.getName().equals("intent-filter")) {













                ProviderIntentInfo intent = new ProviderIntentInfo(outInfo);













                if (!parseIntent(res, parser, attrs, true, intent, outError)) {













                    return false;













                }













                outInfo.intents.add(intent);



























            } else if (parser.getName().equals("meta-data")) {















                if ((outInfo.metaData=parseMetaData(res, parser, attrs,















                        outInfo.metaData, outError)) == null) {















                    return false;










@@ -3982,7 +3989,7 @@ public class PackageParser {













        return si;















    }





























    public final static class Provider extends Component {













    public final static class Provider extends Component<ProviderIntentInfo> {















        public final ProviderInfo info;















        public boolean syncable;


























@@ -4116,6 +4123,24 @@ public class PackageParser {













        }















    }





























    public static final class ProviderIntentInfo extends IntentInfo {













        public final Provider provider;



























        public ProviderIntentInfo(Provider provider) {













            this.provider = provider;













        }



























        public String toString() {













            StringBuilder sb = new StringBuilder(128);













            sb.append("ProviderIntentInfo{");













            sb.append(Integer.toHexString(System.identityHashCode(this)));













            sb.append(' ');













            provider.appendComponentShortName(sb);













            sb.append('}');













            return sb.toString();













        }













    }





























    /**















     * @hide















     */