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

Merge "Fix spelling of "HARDWARE"" am: 9fbe481727

Browse Source 
am: 281664abf5

Change-Id: Ia44897a95b7ac0d0b394a1605ff9cdb6a586e236
This commit is contained in:
Hans Boehm
2019-01-09 11:34:08 -08:00
committed by android-build-merger
parent 5fb25b6389 281664abf5
commit 5ff66466e5
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) {
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");
}

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

@@ -440,7 +440,8 @@ public class BitmapFactory {
if (opts == null) return;
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) {