Merge "Address API feedback." (d5f4165e) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -12513,7 +12513,7 @@ package android.database {
		method public int getInt(int);
		method public long getLong(int);
		method public android.net.Uri getNotificationUri();
		method public default java.util.List<android.net.Uri> getNotificationUris();
		method @Nullable public default java.util.List<android.net.Uri> getNotificationUris();
		method public int getPosition();
		method public short getShort(int);
		method public String getString(int);
		@@ -38601,10 +38601,10 @@ package android.provider {
		}

		public static final class MediaStore.Downloads implements android.provider.MediaStore.DownloadColumns {
		method public static android.net.Uri getContentUri(String);
		method @NonNull public static android.net.Uri getContentUri(@NonNull String);
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/download";
		field public static final android.net.Uri EXTERNAL_CONTENT_URI;
		field public static final android.net.Uri INTERNAL_CONTENT_URI;
		field @NonNull public static final android.net.Uri EXTERNAL_CONTENT_URI;
		field @NonNull public static final android.net.Uri INTERNAL_CONTENT_URI;
		}

		public static final class MediaStore.Files {

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.database;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.ContentResolver;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -473,7 +474,7 @@ public interface Cursor extends Closeable {
		* ContentResolver.registerContentObserver} to find out about changes to this Cursor's
		* data. May be null if no notification URI has been set.
		*/
		default List<Uri> getNotificationUris() {
		default @Nullable List<Uri> getNotificationUris() {
		final Uri notifyUri = getNotificationUri();
		return notifyUri == null ? null : Arrays.asList(notifyUri);
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -1299,6 +1299,7 @@ public final class MediaStore {
		/**
		* The content:// style URI for the internal storage.
		*/
		@NonNull
		public static final Uri INTERNAL_CONTENT_URI =
		getContentUri("internal");

		@@ -1306,6 +1307,7 @@ public final class MediaStore {
		* The content:// style URI for the "primary" external storage
		* volume.
		*/
		@NonNull
		public static final Uri EXTERNAL_CONTENT_URI =
		getContentUri("external");

		@@ -1330,13 +1332,13 @@ public final class MediaStore {
		* @param volumeName the name of the volume to get the URI for
		* @return the URI to the image media table on the given volume
		*/
		public static Uri getContentUri(String volumeName) {
		public static @NonNull Uri getContentUri(@NonNull String volumeName) {
		return AUTHORITY_URI.buildUpon().appendPath(volumeName)
		.appendPath("downloads").build();
		}

		/** @hide */
		public static Uri getContentUriForPath(@NonNull String path) {
		public static @NonNull Uri getContentUriForPath(@NonNull String path) {
		return getContentUri(getVolumeName(new File(path)));
		}