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

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

Browse Source
This commit is contained in:
John Reck
2018-06-01 22:25:52 +00:00
committed by Android (Google) Code Review
parent 4eca92d579 44fc6317f1
commit c4f520ddb6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
graphics/java/android/graphics/Bitmap.java
View File

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

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

@@ -123,6 +123,9 @@ public class Picture {
* drawn to a hardware-accelerated canvas. If this returns true then this Picture can only * drawn to a hardware-accelerated canvas. If this returns true then this Picture can only
* be drawn to another Picture or to a Canvas where canvas.isHardwareAccelerated() is true. * be drawn to another Picture or to a Canvas where canvas.isHardwareAccelerated() is true.
* *
* Note this value is only updated after recording has finished by a call to
* {@link #endRecording()}. Prior to that it will be the default value of false.
*
* @return true if the Picture can only be drawn to a hardware-accelerated canvas, * @return true if the Picture can only be drawn to a hardware-accelerated canvas,
* false otherwise. * false otherwise.
*/ */