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

Merge "Remove bitmap::getBitmapAllocationByteCount"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-27 19:03:27 +00:00
committed by Android (Google) Code Review
parent 6aa0339052 ca8aef6376
commit cdbd41b6ee
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,9 +436,15 @@ public class BitmapFactory {
static void validate(Options opts) {
if (opts == null) return;
if (opts.inBitmap != null && opts.inBitmap.getConfig() == Bitmap.Config.HARDWARE) {
throw new IllegalArgumentException(
"Bitmaps with Config.HARDWARE are always immutable");
if (opts.inBitmap != null) {
if (opts.inBitmap.getConfig() == Bitmap.Config.HARDWARE) {
throw new IllegalArgumentException(
"Bitmaps with Config.HARDWARE are always immutable");
}
if (opts.inBitmap.isRecycled()) {
throw new IllegalArgumentException(
"Cannot reuse a recycled Bitmap");
}
}
if (opts.inMutable && opts.inPreferredConfig == Bitmap.Config.HARDWARE) {