Merge "Public APIs for ID-specific Uris, misc items." (7b28a9f7) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -9348,6 +9348,7 @@ package android.content {
		field public static final String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
		field public static final String MIMETYPE_TEXT_PLAIN = "text/plain";
		field public static final String MIMETYPE_TEXT_URILIST = "text/uri-list";
		field public static final String MIMETYPE_UNKNOWN = "application/octet-stream";
		}

		public class ClipboardManager extends android.text.ClipboardManager {
		@@ -9695,6 +9696,7 @@ package android.content {
		method public Long getAsLong(String);
		method public Short getAsShort(String);
		method public String getAsString(String);
		method public boolean isEmpty();
		method public java.util.Set<java.lang.String> keySet();
		method public void put(String, String);
		method public void put(String, Byte);
		@@ -34530,6 +34532,7 @@ package android.os {
		method public static String getExternalStorageState();
		method public static String getExternalStorageState(java.io.File);
		method @NonNull public static java.io.File getRootDirectory();
		method @NonNull public static java.io.File getStorageDirectory();
		method @Deprecated public static String getStorageState(java.io.File);
		method public static boolean isExternalStorageEmulated();
		method public static boolean isExternalStorageEmulated(@NonNull java.io.File);
		@@ -38353,8 +38356,10 @@ package android.provider {
		ctor public MediaStore();
		method @Nullable public static android.net.Uri getDocumentUri(@NonNull android.content.Context, @NonNull android.net.Uri);
		method @NonNull public static java.util.Set<java.lang.String> getExternalVolumeNames(@NonNull android.content.Context);
		method public static boolean getIncludePending(@NonNull android.net.Uri);
		method public static android.net.Uri getMediaScannerUri();
		method @Nullable public static android.net.Uri getMediaUri(@NonNull android.content.Context, @NonNull android.net.Uri);
		method public static boolean getRequireOriginal(@NonNull android.net.Uri);
		method @NonNull public static String getVersion(@NonNull android.content.Context);
		method @NonNull public static String getVersion(@NonNull android.content.Context, @NonNull String);
		method @NonNull public static String getVolumeName(@NonNull android.net.Uri);
		@@ -38497,6 +38502,7 @@ package android.provider {
		public static final class MediaStore.Audio.Media implements android.provider.MediaStore.Audio.AudioColumns {
		ctor public MediaStore.Audio.Media();
		method public static android.net.Uri getContentUri(String);
		method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
		method @Deprecated @Nullable public static android.net.Uri getContentUriForPath(@NonNull String);
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
		field public static final String DEFAULT_SORT_ORDER = "title_key";
		@@ -38547,6 +38553,7 @@ package android.provider {

		public static final class MediaStore.Downloads implements android.provider.MediaStore.DownloadColumns {
		method @NonNull public static android.net.Uri getContentUri(@NonNull String);
		method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/download";
		field @NonNull public static final android.net.Uri EXTERNAL_CONTENT_URI;
		field @NonNull public static final android.net.Uri INTERNAL_CONTENT_URI;
		@@ -38587,6 +38594,7 @@ package android.provider {
		ctor public MediaStore.Images.Media();
		method @Deprecated public static android.graphics.Bitmap getBitmap(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException, java.io.IOException;
		method public static android.net.Uri getContentUri(String);
		method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
		method @Deprecated public static String insertImage(android.content.ContentResolver, String, String, String) throws java.io.FileNotFoundException;
		method @Deprecated public static String insertImage(android.content.ContentResolver, android.graphics.Bitmap, String, String);
		method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
		@@ -38656,6 +38664,7 @@ package android.provider {
		public static final class MediaStore.Video.Media implements android.provider.MediaStore.Video.VideoColumns {
		ctor public MediaStore.Video.Media();
		method public static android.net.Uri getContentUri(String);
		method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/video";
		field public static final String DEFAULT_SORT_ORDER = "title";
		field public static final android.net.Uri EXTERNAL_CONTENT_URI;

api/removed.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -481,9 +481,8 @@ package android.provider {
		@Deprecated public static class MediaStore.PendingParams {
		ctor public MediaStore.PendingParams(@NonNull android.net.Uri, @NonNull String, @NonNull String);
		method public void setDownloadUri(@Nullable android.net.Uri);
		method public void setPrimaryDirectory(@Nullable String);
		method public void setRefererUri(@Nullable android.net.Uri);
		method public void setSecondaryDirectory(@Nullable String);
		method public void setRelativePath(@Nullable String);
		}

		@Deprecated public static class MediaStore.PendingSession implements java.lang.AutoCloseable {

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -1736,7 +1736,6 @@ package android.os {
		public class Environment {
		method public static java.io.File buildPath(java.io.File, java.lang.String...);
		method @NonNull public static java.io.File getProductDirectory();
		method @NonNull public static java.io.File getStorageDirectory();
		}

		public final class FileUtils {

core/java/android/content/ClipDescription.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,16 @@ public class ClipDescription implements Parcelable {
		*/
		public static final String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";

		/**
		* The MIME type for data whose type is otherwise unknown.
		* <p>
		* Per RFC 2046, the "application" media type is to be used for discrete
		* data which do not fit in any of the other categories, and the
		* "octet-stream" subtype is used to indicate that a body contains arbitrary
		* binary data.
		*/
		public static final String MIMETYPE_UNKNOWN = "application/octet-stream";

		/**
		* The name of the extra used to define a component name when copying/dragging
		* an app icon from Launcher.

core/java/android/content/ContentResolver.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -475,11 +475,9 @@ public abstract class ContentResolver implements ContentInterface {
		*/
		public static final String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";

		/**
		* Default MIME type for files whose type is otherwise unknown.
		* @hide
		*/
		public static final String MIME_TYPE_DEFAULT = "application/octet-stream";
		/** {@hide} */
		@Deprecated
		public static final String MIME_TYPE_DEFAULT = ClipDescription.MIMETYPE_UNKNOWN;

		/** @hide */
		@UnsupportedAppUsage