From 7c42e16eb076b04850b7fa083d31735774bd42dd Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 13 Apr 2017 20:48:29 -0700 Subject: [PATCH] Clarify doc for Bitmap.createBitmap() Bug: 37323693 Test: compiles Change-Id: I8cf316cf4c67b69c47c67848c576af6399a0111f --- graphics/java/android/graphics/Bitmap.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 919068500e6fd..7a8e4873a7c96 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -916,9 +916,8 @@ public final class Bitmap implements Parcelable { * @param hasAlpha If the bitmap is ARGB_8888 or RGBA_16F this flag can be used to * mark the bitmap as opaque. Doing so will clear the bitmap in black * instead of transparent. - * @param colorSpace The color space of the bitmap. If null, - * {@link ColorSpace.Named#SRGB sRGB} is assumed. This argument is - * ignored if the config is not {@link Config#ARGB_8888}. + * @param colorSpace The color space of the bitmap. If null or if the config is not + * {@link Config#ARGB_8888}, {@link ColorSpace.Named#SRGB sRGB} is assumed. * * @throws IllegalArgumentException if the width or height are <= 0, if * Config is Config.HARDWARE (because hardware bitmaps are always @@ -968,9 +967,8 @@ public final class Bitmap implements Parcelable { * @param hasAlpha If the bitmap is ARGB_8888 or RGBA_16F this flag can be used to * mark the bitmap as opaque. Doing so will clear the bitmap in black * instead of transparent. - * @param colorSpace The color space of the bitmap. If null, - * {@link ColorSpace.Named#SRGB sRGB} is assumed. This argument is - * ignored if the config is not {@link Config#ARGB_8888}. + * @param colorSpace The color space of the bitmap. If null or if the config is not + * {@link Config#ARGB_8888}, {@link ColorSpace.Named#SRGB sRGB} is assumed. * * @throws IllegalArgumentException if the width or height are <= 0, if * Config is Config.HARDWARE (because hardware bitmaps are always