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

Commit 1b817f65 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Don't use linked mediastore uris in DownloadProvider operations. 

When MediaProvider db gets recreated, all the media content ids
get renumbered. It's possible that when DownloadProvider is
trying to delete an entry, it is holding onto a invalid mediastore
uri. So, don't use linked mediastore uris in DownloadProvider
operations. Also, revoke any prior uri grants of media content from
DownloadStorageProvider.

Bug: 132087334
Test: manual
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/app/DownloadManagerLegacyTest/src/android/app/cts/DownloadManagerLegacyTest.java
Test: atest cts/tests/app/DownloadManagerApi28Test/src/android/app/cts/DownloadManagerApi28Test.java
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
Change-Id: I4885f5a0ae0b3ab660426605a8a43b8c1d66a4c7
parent b92f0771

core/java/android/app/IUriGrantsManager.aidl

+3 −2
Original line number Original line Diff line number Diff line
@@ -31,11 +31,12 @@ interface IUriGrantsManager { 
            in Uri uri, int mode, int sourceUserId, int targetUserId);

            in Uri uri, int mode, int sourceUserId, int targetUserId);

    /**

    /**

     * Gets the URI permissions granted to an arbitrary package (or all packages if null)

     * Gets the URI permissions granted to an arbitrary package (or all packages if null)

     * NOTE: this is different from getPersistedUriPermissions(), which returns the URIs the package

     * NOTE: this is different from getUriPermissions(), which returns the URIs the package

     * granted to another packages (instead of those granted to it).

     * granted to another packages (instead of those granted to it).

     */

     */

    ParceledListSlice getGrantedUriPermissions(in String packageName, int userId);

    ParceledListSlice getGrantedUriPermissions(in String packageName, int userId);

    /** Clears the URI permissions granted to an arbitrary package. */

    /** Clears the URI permissions granted to an arbitrary package. */

    void clearGrantedUriPermissions(in String packageName, int userId);

    void clearGrantedUriPermissions(in String packageName, int userId);

    ParceledListSlice getPersistedUriPermissions(in String packageName, boolean incoming);

    ParceledListSlice getUriPermissions(in String packageName, boolean incoming,

            boolean persistedOnly);

}
 
}

core/java/android/content/ContentResolver.java

+14 −4
Original line number Original line Diff line number Diff line
@@ -2482,8 +2482,8 @@ public abstract class ContentResolver implements ContentInterface { 
     */

     */

    public @NonNull List<UriPermission> getPersistedUriPermissions() {

    public @NonNull List<UriPermission> getPersistedUriPermissions() {

        try {

        try {

            return UriGrantsManager.getService()

            return UriGrantsManager.getService().getUriPermissions(

                    .getPersistedUriPermissions(mPackageName, true).getList();

                    mPackageName, true /* incoming */, true /* persistedOnly */).getList();

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }
@@ -2498,8 +2498,18 @@ public abstract class ContentResolver implements ContentInterface { 
     */

     */

    public @NonNull List<UriPermission> getOutgoingPersistedUriPermissions() {

    public @NonNull List<UriPermission> getOutgoingPersistedUriPermissions() {

        try {

        try {

            return UriGrantsManager.getService()

            return UriGrantsManager.getService().getUriPermissions(

                    .getPersistedUriPermissions(mPackageName, false).getList();

                    mPackageName, false /* incoming */, true /* persistedOnly */).getList();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /** @hide */

    public @NonNull List<UriPermission> getOutgoingUriPermissions() {

        try {

            return UriGrantsManager.getService().getUriPermissions(

                    mPackageName, false /* incoming */, false /* persistedOnly */).getList();

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }

core/java/android/provider/Downloads.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -849,6 +849,8 @@ public final class Downloads { 
    public static final String CALL_MEDIASTORE_DOWNLOADS_DELETED = "mediastore_downloads_deleted";

    public static final String CALL_MEDIASTORE_DOWNLOADS_DELETED = "mediastore_downloads_deleted";

    /** @hide */

    /** @hide */

    public static final String CALL_CREATE_EXTERNAL_PUBLIC_DIR = "create_external_public_dir";

    public static final String CALL_CREATE_EXTERNAL_PUBLIC_DIR = "create_external_public_dir";

    /** @hide */

    public static final String CALL_REVOKE_MEDIASTORE_URI_PERMS = "revoke_mediastore_uri_perms";





    /** @hide */

    /** @hide */

    public static final String EXTRA_IDS = "ids";

    public static final String EXTRA_IDS = "ids";

services/art-profile

+1 −1
Original line number Original line Diff line number Diff line
@@ -13532,7 +13532,7 @@ HSPLcom/android/server/uri/UriGrantsManagerService;->checkHoldingPermissionsInte 
HSPLcom/android/server/uri/UriGrantsManagerService;->checkUriPermission(Lcom/android/server/uri/GrantUri;II)Z

HSPLcom/android/server/uri/UriGrantsManagerService;->checkUriPermission(Lcom/android/server/uri/GrantUri;II)Z

HSPLcom/android/server/uri/UriGrantsManagerService;->enforceNotIsolatedCaller(Ljava/lang/String;)V

HSPLcom/android/server/uri/UriGrantsManagerService;->enforceNotIsolatedCaller(Ljava/lang/String;)V

HSPLcom/android/server/uri/UriGrantsManagerService;->findOrCreateUriPermission(Ljava/lang/String;Ljava/lang/String;ILcom/android/server/uri/GrantUri;)Lcom/android/server/uri/UriPermission;

HSPLcom/android/server/uri/UriGrantsManagerService;->findOrCreateUriPermission(Ljava/lang/String;Ljava/lang/String;ILcom/android/server/uri/GrantUri;)Lcom/android/server/uri/UriPermission;

PLcom/android/server/uri/UriGrantsManagerService;->getPersistedUriPermissions(Ljava/lang/String;Z)Landroid/content/pm/ParceledListSlice;

PLcom/android/server/uri/UriGrantsManagerService;->getPersistedUriPermissions(Ljava/lang/String;ZZ)Landroid/content/pm/ParceledListSlice;

HSPLcom/android/server/uri/UriGrantsManagerService;->getProviderInfo(Ljava/lang/String;II)Landroid/content/pm/ProviderInfo;

HSPLcom/android/server/uri/UriGrantsManagerService;->getProviderInfo(Ljava/lang/String;II)Landroid/content/pm/ProviderInfo;

HSPLcom/android/server/uri/UriGrantsManagerService;->grantUriPermission(ILjava/lang/String;Lcom/android/server/uri/GrantUri;ILcom/android/server/uri/UriPermissionOwner;I)V

HSPLcom/android/server/uri/UriGrantsManagerService;->grantUriPermission(ILjava/lang/String;Lcom/android/server/uri/GrantUri;ILcom/android/server/uri/UriPermissionOwner;I)V

HSPLcom/android/server/uri/UriGrantsManagerService;->grantUriPermissionFromIntent(ILjava/lang/String;Landroid/content/Intent;Lcom/android/server/uri/UriPermissionOwner;I)V

HSPLcom/android/server/uri/UriGrantsManagerService;->grantUriPermissionFromIntent(ILjava/lang/String;Landroid/content/Intent;Lcom/android/server/uri/UriPermissionOwner;I)V

services/core/java/com/android/server/uri/UriGrantsManagerService.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -211,9 +211,9 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
    }

    }





    @Override

    @Override

    public ParceledListSlice<android.content.UriPermission> getPersistedUriPermissions(

    public ParceledListSlice<android.content.UriPermission> getUriPermissions(

            String packageName, boolean incoming) {

            String packageName, boolean incoming, boolean persistedOnly) {

        enforceNotIsolatedCaller("getPersistedUriPermissions");

        enforceNotIsolatedCaller("getUriPermissions");

        Preconditions.checkNotNull(packageName, "packageName");

        Preconditions.checkNotNull(packageName, "packageName");





        final int callingUid = Binder.getCallingUid();

        final int callingUid = Binder.getCallingUid();
@@ -240,7 +240,8 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
                } else {

                } else {

                    for (int j = 0; j < perms.size(); j++) {

                    for (int j = 0; j < perms.size(); j++) {

                        final UriPermission perm = perms.valueAt(j);

                        final UriPermission perm = perms.valueAt(j);

                        if (packageName.equals(perm.targetPkg) && perm.persistedModeFlags != 0) {

                        if (packageName.equals(perm.targetPkg)

                                && (!persistedOnly || perm.persistedModeFlags != 0)) {

                            result.add(perm.buildPersistedPublicApiObject());

                            result.add(perm.buildPersistedPublicApiObject());

                        }

                        }

                    }

                    }
@@ -252,7 +253,8 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { 
                            mGrantedUriPermissions.valueAt(i);

                            mGrantedUriPermissions.valueAt(i);

                    for (int j = 0; j < perms.size(); j++) {

                    for (int j = 0; j < perms.size(); j++) {

                        final UriPermission perm = perms.valueAt(j);

                        final UriPermission perm = perms.valueAt(j);

                        if (packageName.equals(perm.sourcePkg) && perm.persistedModeFlags != 0) {

                        if (packageName.equals(perm.sourcePkg)

                                && (!persistedOnly || perm.persistedModeFlags != 0)) {

                            result.add(perm.buildPersistedPublicApiObject());

                            result.add(perm.buildPersistedPublicApiObject());

                        }

                        }

                    }

                    }