Merge "APIs for reviewing, listing volumes, hashes." (cef52302) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −1

core/java/android/provider/MediaStore.java

+169 −65

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -36900,6 +36900,7 @@ package android.provider {

	public final class MediaStore {		public final class MediaStore {
	ctor public MediaStore();		ctor public MediaStore();
			method public static java.util.Set<java.lang.String> getAllVolumeNames(android.content.Context);
	method public static android.net.Uri getDocumentUri(android.content.Context, android.net.Uri);		method public static android.net.Uri getDocumentUri(android.content.Context, android.net.Uri);
	method public static android.net.Uri getMediaScannerUri();		method public static android.net.Uri getMediaScannerUri();
	method public static android.net.Uri getMediaUri(android.content.Context, android.net.Uri);		method public static android.net.Uri getMediaUri(android.content.Context, android.net.Uri);
	@@ -36907,9 +36908,12 @@ package android.provider {
	method public static java.lang.String getVolumeName(android.net.Uri);		method public static java.lang.String getVolumeName(android.net.Uri);
	field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";		field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
	field public static final java.lang.String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE";		field public static final java.lang.String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE";
			field public static final java.lang.String ACTION_REVIEW = "android.provider.action.REVIEW";
			field public static final java.lang.String ACTION_REVIEW_SECURE = "android.provider.action.REVIEW_SECURE";
	field public static final java.lang.String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";		field public static final java.lang.String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";
	field public static final java.lang.String AUTHORITY = "media";		field public static final java.lang.String AUTHORITY = "media";
	field public static final android.net.Uri AUTHORITY_URI;		field public static final android.net.Uri AUTHORITY_URI;
			field public static final java.lang.String EXTRA_BRIGHTNESS = "android.provider.extra.BRIGHTNESS";
	field public static final java.lang.String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";		field public static final java.lang.String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
	field public static final java.lang.String EXTRA_FINISH_ON_COMPLETION = "android.intent.extra.finishOnCompletion";		field public static final java.lang.String EXTRA_FINISH_ON_COMPLETION = "android.intent.extra.finishOnCompletion";
	field public static final java.lang.String EXTRA_FULL_SCREEN = "android.intent.extra.fullScreen";		field public static final java.lang.String EXTRA_FULL_SCREEN = "android.intent.extra.fullScreen";
	@@ -37035,7 +37039,7 @@ package android.provider {
	public static final class MediaStore.Audio.Media implements android.provider.MediaStore.Audio.AudioColumns {		public static final class MediaStore.Audio.Media implements android.provider.MediaStore.Audio.AudioColumns {
	ctor public MediaStore.Audio.Media();		ctor public MediaStore.Audio.Media();
	method public static android.net.Uri getContentUri(java.lang.String);		method public static android.net.Uri getContentUri(java.lang.String);
	method public static android.net.Uri getContentUriForPath(java.lang.String);		method public static deprecated android.net.Uri getContentUriForPath(java.lang.String);
	field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/audio";		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
	field public static final java.lang.String DEFAULT_SORT_ORDER = "title_key";		field public static final java.lang.String DEFAULT_SORT_ORDER = "title_key";
	field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/audio";		field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/audio";
	@@ -37157,6 +37161,7 @@ package android.provider {
	field public static final java.lang.String DATE_ADDED = "date_added";		field public static final java.lang.String DATE_ADDED = "date_added";
	field public static final java.lang.String DATE_MODIFIED = "date_modified";		field public static final java.lang.String DATE_MODIFIED = "date_modified";
	field public static final java.lang.String DISPLAY_NAME = "_display_name";		field public static final java.lang.String DISPLAY_NAME = "_display_name";
			field public static final java.lang.String HASH = "_hash";
	field public static final java.lang.String HEIGHT = "height";		field public static final java.lang.String HEIGHT = "height";
	field public static final java.lang.String MIME_TYPE = "mime_type";		field public static final java.lang.String MIME_TYPE = "mime_type";
	field public static final java.lang.String SIZE = "_size";		field public static final java.lang.String SIZE = "_size";