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

Merge "Flush mPostDrawTransaction when WSA is torn down" into sc-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2021-06-25 14:33:58 +00:00
committed by Android (Google) Code Review
parent b6475f9e57 7da389fc6c
commit 328ba5dcb3
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -16,12 +16,6 @@
package com.android.server.wm; package com.android.server.wm;
import static android.graphics.Matrix.MSCALE_X;
import static android.graphics.Matrix.MSCALE_Y;
import static android.graphics.Matrix.MSKEW_X;
import static android.graphics.Matrix.MSKEW_Y;
import static android.graphics.Matrix.MTRANS_X;
import static android.graphics.Matrix.MTRANS_Y;
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
@@ -54,14 +48,12 @@ import static com.android.server.wm.WindowStateAnimatorProto.SURFACE;
import static com.android.server.wm.WindowStateAnimatorProto.SYSTEM_DECOR_RECT; import static com.android.server.wm.WindowStateAnimatorProto.SYSTEM_DECOR_RECT;
import android.content.Context; import android.content.Context;
import android.graphics.Matrix;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Debug; import android.os.Debug;
import android.os.Trace; import android.os.Trace;
import android.util.Slog; import android.util.Slog;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
import android.view.DisplayInfo;
import android.view.Surface.OutOfResourcesException; import android.view.Surface.OutOfResourcesException;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.WindowManager; import android.view.WindowManager;
@@ -260,7 +252,10 @@ class WindowStateAnimator {
} }
if (postDrawTransaction != null) { if (postDrawTransaction != null) {
if (mLastHidden) { // If there is no surface, the last draw was for the previous surface. We don't want to
// wait until the new surface is shown and instead just apply the transaction right
// away.
if (mLastHidden && mDrawState != NO_SURFACE) {
mPostDrawTransaction.merge(postDrawTransaction); mPostDrawTransaction.merge(postDrawTransaction);
layoutNeeded = true; layoutNeeded = true;
} else { } else {
@@ -830,6 +825,10 @@ class WindowStateAnimator {
} }
void destroySurface(SurfaceControl.Transaction t) { void destroySurface(SurfaceControl.Transaction t) {
// Since the SurfaceControl is getting torn down, it's safe to just clean up any
// pending transactions that were in mPostDrawTransaction, as well.
t.merge(mPostDrawTransaction);
try { try {
if (mSurfaceController != null) { if (mSurfaceController != null) {
mSurfaceController.destroy(t); mSurfaceController.destroy(t);