summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/graphics/BitmapFactory.java
diff options
context:
space:
mode:
authorNewton Allen <newt@google.com>2013-11-07 05:19:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-07 05:19:12 +0000
commitbadb59cd5d2a2905494964889f002a277211000a (patch)
treea05d5d3810c71a7ce4f5a631057eef39665e54c8 /graphics/java/android/graphics/BitmapFactory.java
parentc565583384952007f37e090fb354d232f407bd31 (diff)
parent47feee535f9e4e77165b93b6b9f10379e7aa4bbd (diff)
downloadframeworks_base-badb59cd5d2a2905494964889f002a277211000a.zip
frameworks_base-badb59cd5d2a2905494964889f002a277211000a.tar.gz
frameworks_base-badb59cd5d2a2905494964889f002a277211000a.tar.bz2
am 47feee53: Merge "Fix some documentation typos." into klp-docs
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd': Fix some documentation typos.
Diffstat (limited to 'graphics/java/android/graphics/BitmapFactory.java')
-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 b08ce09..429be49 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -469,7 +469,7 @@ public class BitmapFactory {
*
* @param res The resources object containing the image data
* @param id The resource id of the image data
- * @return The decoded bitmap, or null if the image could not be decode.
+ * @return The decoded bitmap, or null if the image could not be decoded.
*/
public static Bitmap decodeResource(Resources res, int id) {
return decodeResource(res, id, null);
@@ -517,7 +517,7 @@ public class BitmapFactory {
* @param offset offset into imageData for where the decoder should begin
* parsing.
* @param length the number of bytes, beginning at offset, to parse
- * @return The decoded bitmap, or null if the image could not be decode.
+ * @return The decoded bitmap, or null if the image could not be decoded.
*/
public static Bitmap decodeByteArray(byte[] data, int offset, int length) {
return decodeByteArray(data, offset, length, null);