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

Commit a1189dcf authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "permz" 

* changes:
  Flesh out remaining CR.wrap() methods.
  Apps using storage must have runtime permission.
parents 55957904 5693cfd1

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -680,9 +680,11 @@ package android.content.pm { 
    field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";

    field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";

    field public static final int FLAG_PERMISSION_HIDDEN = 1024; // 0x400

    field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4

    field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40

    field public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8

    field public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 128; // 0x80

    field public static final int FLAG_PERMISSION_SYSTEM_FIXED = 16; // 0x10

    field public static final int FLAG_PERMISSION_USER_FIXED = 2; // 0x2

    field public static final int FLAG_PERMISSION_USER_SET = 1; // 0x1

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

core/java/android/content/ContentResolver.java

+19 −6
Original line number Diff line number Diff line
@@ -1313,6 +1313,12 @@ public abstract class ContentResolver implements ContentInterface { 
    public final @Nullable ParcelFileDescriptor openFileDescriptor(@NonNull Uri uri,

            @NonNull String mode, @Nullable CancellationSignal cancellationSignal)

                    throws FileNotFoundException {

        try {

            if (mWrapped != null) return mWrapped.openFile(uri, mode, cancellationSignal);

        } catch (RemoteException e) {

            return null;

        }



        AssetFileDescriptor afd = openAssetFileDescriptor(uri, mode, cancellationSignal);

        if (afd == null) {

            return null;
@@ -1455,6 +1461,12 @@ public abstract class ContentResolver implements ContentInterface { 
        Preconditions.checkNotNull(uri, "uri");

        Preconditions.checkNotNull(mode, "mode");



        try {

            if (mWrapped != null) return mWrapped.openAssetFile(uri, mode, cancellationSignal);

        } catch (RemoteException e) {

            return null;

        }



        String scheme = uri.getScheme();

        if (SCHEME_ANDROID_RESOURCE.equals(scheme)) {

            if (!"r".equals(mode)) {
@@ -1634,6 +1646,12 @@ public abstract class ContentResolver implements ContentInterface { 
        Preconditions.checkNotNull(uri, "uri");

        Preconditions.checkNotNull(mimeType, "mimeType");



        try {

            if (mWrapped != null) return mWrapped.openTypedAssetFile(uri, mimeType, opts, cancellationSignal);

        } catch (RemoteException e) {

            return null;

        }



        IContentProvider unstableProvider = acquireUnstableProvider(uri);

        if (unstableProvider == null) {

            throw new FileNotFoundException("No content provider: " + uri);
@@ -3525,12 +3543,7 @@ public abstract class ContentResolver implements ContentInterface { 
     */

    public @NonNull Bitmap loadThumbnail(@NonNull Uri uri, @NonNull Size size,

            @Nullable CancellationSignal signal) throws IOException {

        Objects.requireNonNull(uri);

        Objects.requireNonNull(size);



        try (ContentProviderClient client = acquireContentProviderClient(uri)) {

            return loadThumbnail(client, uri, size, signal, ImageDecoder.ALLOCATOR_SOFTWARE);

        }

        return loadThumbnail(this, uri, size, signal, ImageDecoder.ALLOCATOR_SOFTWARE);

    }



    /** {@hide} */

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

+2 −0
Original line number Diff line number Diff line
@@ -2998,6 +2998,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static final int FLAG_PERMISSION_POLICY_FIXED =  1 << 2;



    /**
@@ -3021,6 +3022,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static final int FLAG_PERMISSION_SYSTEM_FIXED =  1 << 4;



    /**

core/java/android/provider/MediaStore.java

+4 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.annotation.UnsupportedAppUsage; 
import android.app.Activity;

import android.app.AppGlobals;

import android.content.ClipData;

import android.content.ContentInterface;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

import android.content.ContentUris;
@@ -1714,11 +1715,9 @@ public final class MediaStore { 
                    url = cr.insert(EXTERNAL_CONTENT_URI, values);



                    if (source != null) {

                        OutputStream imageOut = cr.openOutputStream(url);

                        try {

                            source.compress(Bitmap.CompressFormat.JPEG, 50, imageOut);

                        } finally {

                            imageOut.close();

                        try (OutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream(

                                cr.openFile(url, "w", null))) {

                            source.compress(Bitmap.CompressFormat.JPEG, 50, out);

                        }



                        long id = ContentUris.parseId(url);