Merge "Reveal color standard, transfer, and range." (1a4223e5) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −1

core/java/android/content/Context.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1559,7 +1559,14 @@ public abstract class Context {
	* @see Environment#getExternalStorageState(File)		* @see Environment#getExternalStorageState(File)
	* @see Environment#isExternalStorageEmulated(File)		* @see Environment#isExternalStorageEmulated(File)
	* @see Environment#isExternalStorageRemovable(File)		* @see Environment#isExternalStorageRemovable(File)
			* @deprecated These directories still exist and are scanned, but developers
			* are encouraged to migrate to inserting content into a
			* {@link MediaStore} collection directly, as any app can
			* contribute new media to {@link MediaStore} with no
			* permissions required, starting in
			* {@link android.os.Build.VERSION_CODES#Q}.
	*/		*/
			@Deprecated
	public abstract File[] getExternalMediaDirs();		public abstract File[] getExternalMediaDirs();

	/**		/**

core/java/android/os/ParcelFileDescriptor.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,12 +35,15 @@ import android.annotation.TestApi;
	import android.annotation.UnsupportedAppUsage;		import android.annotation.UnsupportedAppUsage;
	import android.content.BroadcastReceiver;		import android.content.BroadcastReceiver;
	import android.content.ContentProvider;		import android.content.ContentProvider;
			import android.content.ContentResolver;
			import android.net.Uri;
	import android.os.MessageQueue.OnFileDescriptorEventListener;		import android.os.MessageQueue.OnFileDescriptorEventListener;
	import android.system.ErrnoException;		import android.system.ErrnoException;
	import android.system.Os;		import android.system.Os;
	import android.system.OsConstants;		import android.system.OsConstants;
	import android.system.StructStat;		import android.system.StructStat;
	import android.util.Log;		import android.util.Log;
			import android.util.Size;

	import dalvik.system.CloseGuard;		import dalvik.system.CloseGuard;
	import dalvik.system.VMRuntime;		import dalvik.system.VMRuntime;
	@@ -204,6 +207,10 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {

	/**		/**
	* Create a new ParcelFileDescriptor accessing a given file.		* Create a new ParcelFileDescriptor accessing a given file.
			* <p>
			* This method should only be used for files that you have direct access to;
			* if you'd like to work with files hosted outside your app, use an API like
			* {@link ContentResolver#openFile(Uri, String, CancellationSignal)}.
	*		*
	* @param file The file to be opened.		* @param file The file to be opened.
	* @param mode The desired access mode, must be one of		* @param mode The desired access mode, must be one of
	@@ -226,6 +233,10 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {

	/**		/**
	* Create a new ParcelFileDescriptor accessing a given file.		* Create a new ParcelFileDescriptor accessing a given file.
			* <p>
			* This method should only be used for files that you have direct access to;
			* if you'd like to work with files hosted outside your app, use an API like
			* {@link ContentResolver#openFile(Uri, String, CancellationSignal)}.
	*		*
	* @param file The file to be opened.		* @param file The file to be opened.
	* @param mode The desired access mode, must be one of		* @param mode The desired access mode, must be one of

core/java/android/provider/MediaStore.java

+17 −6

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ import android.graphics.Point;
	import android.graphics.PostProcessor;		import android.graphics.PostProcessor;
	import android.media.ExifInterface;		import android.media.ExifInterface;
	import android.media.MediaFile;		import android.media.MediaFile;
			import android.media.MediaFormat;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.CancellationSignal;		import android.os.CancellationSignal;
	@@ -3007,22 +3008,32 @@ public final class MediaStore {
	public static final String BOOKMARK = "bookmark";		public static final String BOOKMARK = "bookmark";

	/**		/**
	* The standard of color aspects		* The color standard of this media file, if available.
	* @hide		*
			* @see MediaFormat#COLOR_STANDARD_BT709
			* @see MediaFormat#COLOR_STANDARD_BT601_PAL
			* @see MediaFormat#COLOR_STANDARD_BT601_NTSC
			* @see MediaFormat#COLOR_STANDARD_BT2020
	*/		*/
	@Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)		@Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)
	public static final String COLOR_STANDARD = "color_standard";		public static final String COLOR_STANDARD = "color_standard";

	/**		/**
	* The transfer of color aspects		* The color transfer of this media file, if available.
	* @hide		*
			* @see MediaFormat#COLOR_TRANSFER_LINEAR
			* @see MediaFormat#COLOR_TRANSFER_SDR_VIDEO
			* @see MediaFormat#COLOR_TRANSFER_ST2084
			* @see MediaFormat#COLOR_TRANSFER_HLG
	*/		*/
	@Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)		@Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)
	public static final String COLOR_TRANSFER = "color_transfer";		public static final String COLOR_TRANSFER = "color_transfer";

	/**		/**
	* The range of color aspects		* The color range of this media file, if available.
	* @hide		*
			* @see MediaFormat#COLOR_RANGE_LIMITED
			* @see MediaFormat#COLOR_RANGE_FULL
	*/		*/
	@Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)		@Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)
	public static final String COLOR_RANGE = "color_range";		public static final String COLOR_RANGE = "color_range";

media/java/android/media/MediaMetadataRetriever.java

+0 −6