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 
am: 701bb5b754

Change-Id: Ie19e9de91eb3152eff0d92af573e95d1801d939a
This commit is contained in:
Doris Liu
2017-09-26 21:53:41 +00:00
committed by android-build-merger
parent da95863025 701bb5b754
commit e87caf2e92
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.
*/
public static Bitmap createViewBitmap(View view, Matrix matrix, RectF bounds) {
if (!view.isAttachedToWindow()) {
return null;
}
Bitmap bitmap = null;
int bitmapWidth = Math.round(bounds.width());
int bitmapHeight = Math.round(bounds.height());
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;
bitmapHeight *= scale;
matrix.postTranslate(-bounds.left, -bounds.top);