summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Lu <marklu@google.com> 2016-12-17 02:04:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-12-17 02:04:28 +0000
commit88e64bb7391faba5199828585826f92ec82ca748 (patch)
treeae3afb9cbd9944a8e3dd9127859016a7e0095f11
parent7b22d549d483306667e1c9bb615564c664699ce4 (diff)
parenta8f428627253f1060db1a0c7ff4bd3bb6c687fd2 (diff)
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
-rw-r--r--graphics/java/android/graphics/BitmapFactory.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 447a4c4e8345..4afe438c686f 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -49,8 +49,8 @@ public class BitmapFactory {
/**
* If set, decode methods that take the Options object will attempt to
* reuse this bitmap when loading content. If the decode operation
- * cannot use this bitmap, the decode method will return
- * <code>null</code> and will throw an IllegalArgumentException. The
+ * cannot use this bitmap, the decode method will throw an
+ * {@link java.lang.IllegalArgumentException}. The
* current implementation necessitates that the reused bitmap be
* mutable, and the resulting reused bitmap will continue to remain
* mutable even when decoding a resource which would normally result in