Merge "Add logs around BaseDepthController to investigate b/291401432" into udc-qpr-dev

This commit is contained in:
Federico Baron
2023-08-04 19:44:40 +00:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 1 deletions
@@ -193,5 +193,6 @@ public class DepthController extends BaseDepthController implements StateHandler
writer.println(prefix + "\tmIgnoreStateChangesDuringMultiWindowAnimation="
+ mIgnoreStateChangesDuringMultiWindowAnimation);
writer.println(prefix + "\tmPauseBlurs=" + mPauseBlurs);
writer.println(prefix + "\tmWaitingOnSurfaceValidity=" + mWaitingOnSurfaceValidity);
}
}
@@ -18,6 +18,7 @@ package com.android.quickstep.util;
import android.app.WallpaperManager;
import android.os.IBinder;
import android.util.FloatProperty;
import android.util.Log;
import android.view.AttachedSurfaceControl;
import android.view.SurfaceControl;
@@ -50,6 +51,9 @@ public class BaseDepthController {
private static final int DEPTH_INDEX_WIDGET = 1;
private static final int DEPTH_INDEX_COUNT = 2;
// b/291401432
private static final String TAG = "BaseDepthController";
protected final Launcher mLauncher;
/** Property to set the depth for state transition. */
public final MultiProperty stateDepth;
@@ -88,7 +92,7 @@ public class BaseDepthController {
*/
protected boolean mInEarlyWakeUp;
private boolean mWaitingOnSurfaceValidity;
protected boolean mWaitingOnSurfaceValidity;
public BaseDepthController(Launcher activity) {
mLauncher = activity;
@@ -133,9 +137,11 @@ public class BaseDepthController {
return;
}
if (mSurface == null) {
Log.d(TAG, "mSurface is null and mCurrentBlur is: " + mCurrentBlur);
return;
}
if (!mSurface.isValid()) {
Log.d(TAG, "mSurface is not valid");
mWaitingOnSurfaceValidity = true;
onInvalidSurface();
return;
@@ -186,6 +192,8 @@ public class BaseDepthController {
protected void setSurface(SurfaceControl surface) {
if (mSurface != surface || mWaitingOnSurfaceValidity) {
mSurface = surface;
Log.d(TAG, "setSurface:\n\tmWaitingOnSurfaceValidity: " + mWaitingOnSurfaceValidity
+ "\n\tmSurface: " + mSurface);
applyDepthAndBlur();
}
}