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

Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev

Browse Source
This commit is contained in:
Doris Liu
2017-09-26 21:46:42 +00:00
committed by Android (Google) Code Review
parent 4a324cb196 4dc1ec754c
commit 701bb5b754
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/transition/TransitionUtils.java
View File

@@ -159,11 +159,14 @@ public class TransitionUtils {
* @return A bitmap of the given view or null if bounds has no width or height. * @return A bitmap of the given view or null if bounds has no width or height.
*/ */
public static Bitmap createViewBitmap(View view, Matrix matrix, RectF bounds) { public static Bitmap createViewBitmap(View view, Matrix matrix, RectF bounds) {
if (!view.isAttachedToWindow()) {
return null;
}
Bitmap bitmap = null; Bitmap bitmap = null;
int bitmapWidth = Math.round(bounds.width()); int bitmapWidth = Math.round(bounds.width());
int bitmapHeight = Math.round(bounds.height()); int bitmapHeight = Math.round(bounds.height());
if (bitmapWidth > 0 && bitmapHeight > 0) { if (bitmapWidth > 0 && bitmapHeight > 0) {
float scale = Math.min(1f, ((float)MAX_IMAGE_SIZE) / (bitmapWidth * bitmapHeight)); float scale = Math.min(1f, ((float) MAX_IMAGE_SIZE) / (bitmapWidth * bitmapHeight));
bitmapWidth *= scale; bitmapWidth *= scale;
bitmapHeight *= scale; bitmapHeight *= scale;
matrix.postTranslate(-bounds.left, -bounds.top); matrix.postTranslate(-bounds.left, -bounds.top);