Define EXTRA_SIZE for ContentProviders. (5b836f29) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −2

Original line number	Diff line number	Diff line
		@@ -7151,6 +7151,7 @@ package android.content {
		field public static final java.lang.String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
		field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
		field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
		field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";
		field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";
		field public static final java.lang.String SCHEME_CONTENT = "content";
		field public static final java.lang.String SCHEME_FILE = "file";
		@@ -32239,17 +32240,23 @@ package android.util {
		field public static final android.util.Rational ZERO;
		}

		public final class Size {
		public final class Size implements android.os.Parcelable {
		ctor public Size(int, int);
		method public int describeContents();
		method public int getHeight();
		method public int getWidth();
		method public static android.util.Size parseSize(java.lang.String) throws java.lang.NumberFormatException;
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class SizeF {
		public final class SizeF implements android.os.Parcelable {
		ctor public SizeF(float, float);
		method public int describeContents();
		method public float getHeight();
		method public float getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class SparseArray implements java.lang.Cloneable {

core/java/android/content/ContentResolver.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.database.ContentObserver;
		import android.database.CrossProcessCursorWrapper;
		import android.database.Cursor;
		import android.database.IContentObserver;
		import android.graphics.Point;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.CancellationSignal;
		@@ -160,6 +161,17 @@ public abstract class ContentResolver {
		public static final String SCHEME_ANDROID_RESOURCE = "android.resource";
		public static final String SCHEME_FILE = "file";

		/**
		* An extra {@link Point} describing the optimal size for a requested image
		* resource, in pixels. If a provider has multiple sizes of the image, it
		* should return the image closest to this size.
		*
		* @see #openTypedAssetFileDescriptor(Uri, String, Bundle)
		* @see #openTypedAssetFileDescriptor(Uri, String, Bundle,
		* CancellationSignal)
		*/
		public static final String EXTRA_SIZE = "android.content.extra.SIZE";

		/**
		* This is the Android platform's base MIME type for a content: URI
		* containing a Cursor of a single item. Applications should use this

core/java/android/provider/DocumentsContract.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -510,8 +510,6 @@ public final class DocumentsContract {
		/** {@hide} */
		public static final String METHOD_DELETE_DOCUMENT = "android:deleteDocument";

		/** {@hide} */
		public static final String EXTRA_THUMBNAIL_SIZE = "thumbnail_size";
		/** {@hide} */
		public static final String EXTRA_URI = "uri";

		@@ -819,7 +817,7 @@ public final class DocumentsContract {
		ContentProviderClient client, Uri documentUri, Point size, CancellationSignal signal)
		throws RemoteException, IOException {
		final Bundle openOpts = new Bundle();
		openOpts.putParcelable(DocumentsContract.EXTRA_THUMBNAIL_SIZE, size);
		openOpts.putParcelable(ContentResolver.EXTRA_SIZE, size);

		AssetFileDescriptor afd = null;
		Bitmap bitmap = null;

core/java/android/provider/DocumentsProvider.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.provider;

		import static android.provider.DocumentsContract.EXTRA_THUMBNAIL_SIZE;
		import static android.provider.DocumentsContract.METHOD_CREATE_DOCUMENT;
		import static android.provider.DocumentsContract.METHOD_DELETE_DOCUMENT;
		import static android.provider.DocumentsContract.METHOD_RENAME_DOCUMENT;
		@@ -763,8 +762,8 @@ public abstract class DocumentsProvider extends ContentProvider {
		public final AssetFileDescriptor openTypedAssetFile(Uri uri, String mimeTypeFilter, Bundle opts)
		throws FileNotFoundException {
		enforceTree(uri);
		if (opts != null && opts.containsKey(EXTRA_THUMBNAIL_SIZE)) {
		final Point sizeHint = opts.getParcelable(EXTRA_THUMBNAIL_SIZE);
		if (opts != null && opts.containsKey(ContentResolver.EXTRA_SIZE)) {
		final Point sizeHint = opts.getParcelable(ContentResolver.EXTRA_SIZE);
		return openDocumentThumbnail(getDocumentId(uri), sizeHint, null);
		} else {
		return super.openTypedAssetFile(uri, mimeTypeFilter, opts);
		@@ -781,8 +780,8 @@ public abstract class DocumentsProvider extends ContentProvider {
		Uri uri, String mimeTypeFilter, Bundle opts, CancellationSignal signal)
		throws FileNotFoundException {
		enforceTree(uri);
		if (opts != null && opts.containsKey(EXTRA_THUMBNAIL_SIZE)) {
		final Point sizeHint = opts.getParcelable(EXTRA_THUMBNAIL_SIZE);
		if (opts != null && opts.containsKey(ContentResolver.EXTRA_SIZE)) {
		final Point sizeHint = opts.getParcelable(ContentResolver.EXTRA_SIZE);
		return openDocumentThumbnail(getDocumentId(uri), sizeHint, signal);
		} else {
		return super.openTypedAssetFile(uri, mimeTypeFilter, opts, signal);

core/java/android/util/Size.java

+34 −3

Original line number	Diff line number	Diff line
		@@ -16,12 +16,15 @@

		package android.util;

		import static com.android.internal.util.Preconditions.*;
		import static com.android.internal.util.Preconditions.checkNotNull;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* Immutable class for describing width and height dimensions in pixels.
		*/
		public final class Size {
		public final class Size implements Parcelable {
		/**
		* Create a new immutable Size instance.
		*
		@@ -33,6 +36,11 @@ public final class Size {
		mHeight = height;
		}

		private Size(Parcel in) {
		mWidth = in.readInt();
		mHeight = in.readInt();
		}

		/**
		* Get the width of the size (in pixels).
		* @return width
		@@ -147,6 +155,29 @@ public final class Size {
		return mHeight ^ ((mWidth << (Integer.SIZE / 2)) \| (mWidth >>> (Integer.SIZE / 2)));
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(mWidth);
		out.writeInt(mHeight);
		}

		public static final Parcelable.Creator<Size> CREATOR = new Parcelable.Creator<Size>() {
		@Override
		public Size createFromParcel(Parcel in) {
		return new Size(in);
		}

		@Override
		public Size[] newArray(int size) {
		return new Size[size];
		}
		};

		private final int mWidth;
		private final int mHeight;
		};
		}