Merge "Use ALLOCATOR_SOFTWARE with ImageDecoder"

import android.graphics.Point;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.DeadObjectException;

        Objects.requireNonNull(uri);

        Objects.requireNonNull(size);

        // Older apps might be relying on mutable results, so only consider

        // giving them hardware bitmaps once they target Q or higher. If modern

        // apps need mutable thumbnails, they can always roll their own logic.

        final int allocator;

        if (getTargetSdkVersion() >= Build.VERSION_CODES.Q) {

            allocator = ImageDecoder.ALLOCATOR_DEFAULT;

        } else {

            allocator = ImageDecoder.ALLOCATOR_SOFTWARE;

        }

        try (ContentProviderClient client = acquireContentProviderClient(uri)) {

            return loadThumbnail(client, uri, size, signal, allocator);

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

        }

    }

    public static Bitmap getDocumentThumbnail(ContentProviderClient client, Uri documentUri,

            Point size, CancellationSignal signal) throws IOException {

        return ContentResolver.loadThumbnail(client, documentUri, Point.convert(size), signal,

                ImageDecoder.ALLOCATOR_DEFAULT);

                ImageDecoder.ALLOCATOR_SOFTWARE);

    }

    /**