Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7318c1e authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix strictmode error logs due to task snapshot hw buffer not being... 

Merge "Fix strictmode error logs due to task snapshot hw buffer not being closed" into sc-dev am: 40902ab9 am: f8639868

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090192

Change-Id: Id1a79215b751f9ec64008932318ac7d046632c4e
parents 1ae4f61e f8639868

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java

+2 −3
Original line number Diff line number Diff line
@@ -62,16 +62,15 @@ public class ThumbnailData { 
    }



    private static Bitmap makeThumbnail(TaskSnapshot snapshot) {

        final HardwareBuffer buffer = snapshot.getHardwareBuffer();

        Bitmap thumbnail = null;

        try {

        try (final HardwareBuffer buffer = snapshot.getHardwareBuffer()) {

            if (buffer != null) {

                thumbnail = Bitmap.wrapHardwareBuffer(buffer, snapshot.getColorSpace());

            }

        } catch (IllegalArgumentException ex) {

            // TODO(b/157562905): Workaround for a crash when we get a snapshot without this state

            Log.e("ThumbnailData", "Unexpected snapshot without USAGE_GPU_SAMPLED_IMAGE: "

                    + buffer, ex);

                    + snapshot.getHardwareBuffer(), ex);

        }

        if (thumbnail == null) {

            Point taskSize = snapshot.getTaskSize();

packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java

+3 −2
Original line number Diff line number Diff line
@@ -292,9 +292,10 @@ public class TaskStackChangeListeners { 
                    }

                    case ON_TASK_SNAPSHOT_CHANGED: {

                        Trace.beginSection("onTaskSnapshotChanged");

                        final TaskSnapshot snapshot = (TaskSnapshot) msg.obj;

                        final ThumbnailData thumbnail = new ThumbnailData(snapshot);

                        for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {

                            mTaskStackListeners.get(i).onTaskSnapshotChanged(msg.arg1,

                                    new ThumbnailData((TaskSnapshot) msg.obj));

                            mTaskStackListeners.get(i).onTaskSnapshotChanged(msg.arg1, thumbnail);

                        }

                        Trace.endSection();

                        break;