diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-06-12 04:57:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-12 04:57:08 +0000 |
| commit | 3c4d613926afb38673e0ffccc624d271f7910ec1 (patch) | |
| tree | 5d31a879d8cb6594826f1946d84bfff6e7a1334a /core/java/android/content/ContentProvider.java | |
| parent | 09259de032c5209cbc8c094bd4121358932f1139 (diff) | |
| parent | 34796bd07f871bc762d8ebd55cfbb80fcff4aeca (diff) | |
| download | frameworks_base-3c4d613926afb38673e0ffccc624d271f7910ec1.zip frameworks_base-3c4d613926afb38673e0ffccc624d271f7910ec1.tar.gz frameworks_base-3c4d613926afb38673e0ffccc624d271f7910ec1.tar.bz2 | |
Merge "Sigh, some apps are sending null ContentValues." into mnc-dev
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index d478f4a..494f821 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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); /** |