summaryrefslogtreecommitdiff
path: root/graphics/java/android
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2023-09-08 20:43:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-08 20:43:18 +0000
commit9bb0c1bddb4b3639ca107666db166162fe86fbdf (patch)
tree0d3879eee39a21fcd72cf7d72050a361fd2912e4 /graphics/java/android
parentd0156ec1fa491d33569d2c0c5a6ce702ae7aa695 (diff)
parenta4c2f9badb21180282596ac9730d4777f65e4b4b (diff)
Merge "Fix nullability annotation" into main
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/Bitmap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index a4c655c8ce55..1ff5a3d46f8e 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -1779,7 +1779,7 @@ public final class Bitmap implements Parcelable {
* If the bitmap's internal config is in one of the public formats, return
* that config, otherwise return null.
*/
- @NonNull
+ @Nullable
public final Config getConfig() {
if (mRecycled) {
Log.w(TAG, "Called getConfig() on a recycle()'d bitmap! This is undefined behavior!");