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

Merge "Moving check for empty snapshots earlier." into oc-dr1-dev

Browse Source
This commit is contained in:
Winson Chung
2017-07-06 03:36:47 +00:00
committed by Android (Google) Code Review
parent 7ee9ec59d8 3e13ef8a0e
commit 161d65640e
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,8 +400,8 @@ public class RecentsTransitionHelper {
view.draw(c); view.draw(c);
} }
node.end(c); node.end(c);
return ThreadedRenderer.createHardwareBitmap(node, bufferWidth, bufferHeight) Bitmap hwBitmap = ThreadedRenderer.createHardwareBitmap(node, bufferWidth, bufferHeight);
.createGraphicBufferHandle(); return hwBitmap.createGraphicBufferHandle();
} }
/** /**

20
services/core/java/com/android/server/wm/TaskSnapshotController.java
View File

@@ -18,6 +18,9 @@ package com.android.server.wm;
import static android.app.ActivityManager.ENABLE_TASK_SNAPSHOTS; import static android.app.ActivityManager.ENABLE_TASK_SNAPSHOTS;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.StackId; import android.app.ActivityManager.StackId;
@@ -29,6 +32,7 @@ import android.graphics.Rect;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Slog;
import android.view.DisplayListCanvas; import android.view.DisplayListCanvas;
import android.view.RenderNode; import android.view.RenderNode;
import android.view.ThreadedRenderer; import android.view.ThreadedRenderer;
@@ -57,6 +61,7 @@ import java.io.PrintWriter;
* To access this class, acquire the global window manager lock. * To access this class, acquire the global window manager lock.
*/ */
class TaskSnapshotController { class TaskSnapshotController {
private static final String TAG = TAG_WITH_CLASS_NAME ? "TaskSnapshotController" : TAG_WM;
/** /**
* Return value for {@link #getSnapshotMode}: We are allowed to take a real screenshot to be * Return value for {@link #getSnapshotMode}: We are allowed to take a real screenshot to be
@@ -147,10 +152,17 @@ class TaskSnapshotController {
break; break;
} }
if (snapshot != null) { if (snapshot != null) {
mCache.putSnapshot(task, snapshot); final GraphicBuffer buffer = snapshot.getSnapshot();
mPersister.persistSnapshot(task.mTaskId, task.mUserId, snapshot); if (buffer.getWidth() == 0 || buffer.getHeight() == 0) {
if (task.getController() != null) { buffer.destroy();
task.getController().reportSnapshotChanged(snapshot); Slog.e(TAG, "Invalid task snapshot dimensions " + buffer.getWidth() + "x"
+ buffer.getHeight());
} else {
mCache.putSnapshot(task, snapshot);
mPersister.persistSnapshot(task.mTaskId, task.mUserId, snapshot);
if (task.getController() != null) {
task.getController().reportSnapshotChanged(snapshot);
}
} }
} }
} }

7
services/core/java/com/android/server/wm/TaskSnapshotPersister.java
View File

@@ -291,7 +291,6 @@ class TaskSnapshotPersister {
failed = true; failed = true;
} }
if (!writeBuffer()) { if (!writeBuffer()) {
writeBuffer();
failed = true; failed = true;
} }
if (failed) { if (failed) {
@@ -327,11 +326,7 @@ class TaskSnapshotPersister {
final File reducedFile = getReducedResolutionBitmapFile(mTaskId, mUserId); final File reducedFile = getReducedResolutionBitmapFile(mTaskId, mUserId);
final Bitmap bitmap = Bitmap.createHardwareBitmap(mSnapshot.getSnapshot()); final Bitmap bitmap = Bitmap.createHardwareBitmap(mSnapshot.getSnapshot());
if (bitmap == null) { if (bitmap == null) {
Slog.e(TAG, "Invalid task snapshot"); Slog.e(TAG, "Invalid task snapshot hw bitmap");
return false;
} else if (bitmap.getWidth() == 0 || bitmap.getHeight() == 0) {
Slog.e(TAG, "Invalid task snapshot dimensions " + bitmap.getWidth() + "x"
+ bitmap.getHeight());
return false; return false;
} }