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

Merge "Handling cases with a null bitmap." into oc-dev

Browse Source 
am: 1eddb0cb2e

Change-Id: Iecc01386dc5a236a85d34ff0048ec2b6fd50bc6d
This commit is contained in:
Winson Chung
2017-06-03 01:44:41 +00:00
committed by android-build-merger
parent 427eb020a6 1eddb0cb2e
commit d1a3b24b62
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/ActivityOptions.java
View File

@@ -932,7 +932,7 @@ public class ActivityOptions {
* @hide
*/
public GraphicBuffer getThumbnail() {
return mThumbnail.createGraphicBufferHandle();
return mThumbnail != null ? mThumbnail.createGraphicBufferHandle() : null;
}
/** @hide */
@@ -1243,11 +1243,13 @@ public class ActivityOptions {
case ANIM_THUMBNAIL_ASPECT_SCALE_DOWN:
// Once we parcel the thumbnail for transfering over to the system, create a copy of
// the bitmap to a hardware bitmap and pass through the GraphicBuffer
if (mThumbnail == null) {
b.putParcelable(KEY_ANIM_THUMBNAIL, null);
} else {
if (mThumbnail != null) {
final Bitmap hwBitmap = mThumbnail.copy(Config.HARDWARE, true /* immutable */);
b.putParcelable(KEY_ANIM_THUMBNAIL, hwBitmap.createGraphicBufferHandle());
if (hwBitmap != null) {
b.putParcelable(KEY_ANIM_THUMBNAIL, hwBitmap.createGraphicBufferHandle());
} else {
Slog.w(TAG, "Failed to copy thumbnail");
}
}
b.putInt(KEY_ANIM_START_X, mStartX);
b.putInt(KEY_ANIM_START_Y, mStartY);

2
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -1426,7 +1426,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
pendingOptions.getStartX(), pendingOptions.getStartY(),
pendingOptions.getOnAnimationStartListener(),
scaleUp);
if (intent.getSourceBounds() == null) {
if (intent.getSourceBounds() == null && buffer != null) {
intent.setSourceBounds(new Rect(pendingOptions.getStartX(),
pendingOptions.getStartY(),
pendingOptions.getStartX() + buffer.getWidth(),