Merge "Ensure picture isn't recording in createBitmap" into pi-dev am: c4f520ddb6

am: 39636318ca

Change-Id: If964e798cf39c03cb6d2232d103dbd7bf4941d5a
This commit is contained in:
John Reck
2018-06-01 16:02:30 -07:00
committed by android-build-merger
2 changed files with 4 additions and 0 deletions

View File

@@ -1229,6 +1229,7 @@ public final class Bitmap implements Parcelable {
if (config == null) {
throw new IllegalArgumentException("Config must not be null");
}
source.endRecording();
if (source.requiresHardwareAcceleration() && config != Config.HARDWARE) {
StrictMode.noteSlowCall("GPU readback");
}