Merge "Sigh, some apps are sending null ContentValues." into mnc-dev (3c4d6139) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1072,7 +1072,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		* This must not be {@code null}.
		* @return The URI for the newly inserted item.
		*/
		public abstract @Nullable Uri insert(@NonNull Uri uri, @NonNull ContentValues values);
		public abstract @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues values);

		/**
		* Override this to handle requests to insert a set of new rows, or the
		@@ -1137,7 +1137,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		* @param selection An optional filter to match rows to update.
		* @return the number of rows affected.
		*/
		public abstract int update(@NonNull Uri uri, @NonNull ContentValues values,
		public abstract int update(@NonNull Uri uri, @Nullable ContentValues values,
		@Nullable String selection, @Nullable String[] selectionArgs);

		/**

+2 −5

Original line number	Diff line number	Diff line
		@@ -1218,10 +1218,8 @@ public abstract class ContentResolver {
		* the field. Passing an empty ContentValues will create an empty row.
		* @return the URL of the newly created row.
		*/
		public final @Nullable Uri insert(@NonNull Uri url, @NonNull ContentValues values) {
		public final @Nullable Uri insert(@NonNull Uri url, @Nullable ContentValues values) {
		Preconditions.checkNotNull(url, "url");
		Preconditions.checkNotNull(values, "values");

		IContentProvider provider = acquireProvider(url);
		if (provider == null) {
		throw new IllegalArgumentException("Unknown URL " + url);
		@@ -1350,10 +1348,9 @@ public abstract class ContentResolver {
		* @return the number of rows updated.
		* @throws NullPointerException if uri or values are null
		*/
		public final int update(@NonNull Uri uri, @NonNull ContentValues values,
		public final int update(@NonNull Uri uri, @Nullable ContentValues values,
		@Nullable String where, @Nullable String[] selectionArgs) {
		Preconditions.checkNotNull(uri, "uri");
		Preconditions.checkNotNull(values, "values");
		IContentProvider provider = acquireProvider(uri);
		if (provider == null) {
		throw new IllegalArgumentException("Unknown URI " + uri);