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

Commit 41034486 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

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

parents 93974f48 bac2cb61

quickstep/src/com/android/launcher3/statehandlers/DepthController.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

    }

}

quickstep/src/com/android/quickstep/util/BaseDepthController.java

+9 −1
Original line number Diff line number Diff line
@@ -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();

        }

    }