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

Merge "Fix spelling of "HARDWARE""

Browse Source 
am: 9fbe481727

Change-Id: I090ecaa896e2dcc58a500b5a92eb6ed0be974385
This commit is contained in:
Hans Boehm
2019-01-09 11:24:49 -08:00
committed by android-build-merger
parent 59ce36a44d 9fbe481727
commit 281664abf5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -231,7 +231,7 @@ static jobject doDecode(JNIEnv* env, std::unique_ptr<SkStreamRewindable> stream,
} }
if (isMutable && isHardware) { if (isMutable && isHardware) {
doThrowIAE(env, "Bitmaps with Config.HARWARE are always immutable"); doThrowIAE(env, "Bitmaps with Config.HARDWARE are always immutable");
return nullObjectReturn("Cannot create mutable hardware bitmap"); return nullObjectReturn("Cannot create mutable hardware bitmap");
} }

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

@@ -440,7 +440,8 @@ public class BitmapFactory {
if (opts == null) return; if (opts == null) return;
if (opts.inBitmap != null && opts.inBitmap.getConfig() == Bitmap.Config.HARDWARE) { if (opts.inBitmap != null && opts.inBitmap.getConfig() == Bitmap.Config.HARDWARE) {
throw new IllegalArgumentException("Bitmaps with Config.HARWARE are always immutable"); throw new IllegalArgumentException(
"Bitmaps with Config.HARDWARE are always immutable");
} }
if (opts.inMutable && opts.inPreferredConfig == Bitmap.Config.HARDWARE) { if (opts.inMutable && opts.inPreferredConfig == Bitmap.Config.HARDWARE) {