Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 47feee53: Merge "Fix some documentation typos." into klp-docs

Browse Source 
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
This commit is contained in:
Newton Allen
2013-11-07 05:19:12 +00:00
committed by Android Git Automerger
parent c565583384 47feee535f
commit badb59cd5d
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/BitmapFactory.java
View File

@@ -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);