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

Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499

Browse Source 
am: 948c3638a8

* commit '948c3638a8981d3958b7eb500e128011005fd5e3':
  Fix edge case crash with invalid bitmap dimensions.

Change-Id: I5e88a94f9f8a3e0799046a5e2ce3ed06850455a9
This commit is contained in:
Winson
2016-05-06 00:51:15 +00:00
committed by android-build-merger
parent bb0bd465d3 948c3638a8
commit ec78e7db90
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
View File

@@ -306,8 +306,11 @@ public class RecentsTransitionHelper {
mTmpTransform.fillIn(taskView);
stackLayout.transformToScreenCoordinates(mTmpTransform,
null /* windowOverrideRect */);
specs.add(composeAnimationSpec(stackView, taskView, mTmpTransform,
true /* addHeaderBitmap */));
AppTransitionAnimationSpec spec = composeAnimationSpec(stackView, taskView,
mTmpTransform, true /* addHeaderBitmap */);
if (spec != null) {
specs.add(spec);
}
}
return specs;
}
@@ -329,8 +332,11 @@ public class RecentsTransitionHelper {
mTmpTransform.fillIn(taskView);
stackLayout.transformToScreenCoordinates(mTmpTransform,
null /* windowOverrideRect */);
specs.add(composeAnimationSpec(stackView, tv, mTmpTransform,
true /* addHeaderBitmap */));
AppTransitionAnimationSpec spec = composeAnimationSpec(stackView, tv,
mTmpTransform, true /* addHeaderBitmap */);
if (spec != null) {
specs.add(spec);
}
}
}
}
@@ -376,11 +382,13 @@ public class RecentsTransitionHelper {
private static Bitmap composeHeaderBitmap(TaskView taskView,
TaskViewTransform transform) {
float scale = transform.scale;
int fromHeaderWidth = (int) (transform.rect.width());
int fromHeaderHeight = (int) (taskView.mHeaderView.getMeasuredHeight() * scale);
Bitmap b = Bitmap.createBitmap(fromHeaderWidth, fromHeaderHeight,
Bitmap.Config.ARGB_8888);
int headerWidth = (int) (transform.rect.width());
int headerHeight = (int) (taskView.mHeaderView.getMeasuredHeight() * scale);
if (headerWidth == 0 || headerHeight == 0) {
return null;
}
Bitmap b = Bitmap.createBitmap(headerWidth, headerHeight, Bitmap.Config.ARGB_8888);
if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) {
b.eraseColor(0xFFff0000);
} else {
@@ -400,6 +408,9 @@ public class RecentsTransitionHelper {
Bitmap b = null;
if (addHeaderBitmap) {
b = composeHeaderBitmap(taskView, transform);
if (b == null) {
return null;
}
}
Rect taskRect = new Rect();