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

Commit 645063ee authored by Santos Cordon's avatar Santos Cordon Committed by Automerger Merge Worker
Browse files

Merge "Log each time the layer stack changes for DisplayDevice." into... 

Merge "Log each time the layer stack changes for DisplayDevice." into tm-qpr-dev am: 81a111d8 am: d392b4fb am: 09fcc2b8

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



Change-Id: Id5af26ceba23771e1437118066ecba22a6ef4871
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 396df665 09fcc2b8

services/core/java/com/android/server/display/DisplayDevice.java

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.hardware.display.DisplayViewport;

import android.os.IBinder;

import android.util.Slog;

import android.view.Display;

import android.view.DisplayAddress;

import android.view.Surface;
@@ -39,6 +40,7 @@ import java.io.PrintWriter; 
 * </p>

 */

abstract class DisplayDevice {

    private static final String TAG = "DisplayDevice";

    private static final Display.Mode EMPTY_DISPLAY_MODE = new Display.Mode.Builder().build();



    private final DisplayAdapter mDisplayAdapter;
@@ -269,10 +271,13 @@ abstract class DisplayDevice { 
    /**

     * Sets the display layer stack while in a transaction.

     */

    public final void setLayerStackLocked(SurfaceControl.Transaction t, int layerStack) {

    public final void setLayerStackLocked(SurfaceControl.Transaction t, int layerStack,

            int layerStackTag) {

        if (mCurrentLayerStack != layerStack) {

            mCurrentLayerStack = layerStack;

            t.setDisplayLayerStack(mDisplayToken, layerStack);

            Slog.i(TAG, "[" + layerStackTag + "] Layerstack set to " + layerStack + " for "

                    + mUniqueId);

        }

    }

services/core/java/com/android/server/display/LogicalDisplay.java

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ final class LogicalDisplay { 
            DisplayDevice device,

            boolean isBlanked) {

        // Set the layer stack.

        device.setLayerStackLocked(t, isBlanked ? BLANK_LAYER_STACK : mLayerStack);

        device.setLayerStackLocked(t, isBlanked ? BLANK_LAYER_STACK : mLayerStack, mDisplayId);

        // Also inform whether the device is the same one sent to inputflinger for its layerstack.

        // Prevent displays that are disabled from receiving input.

        // TODO(b/188914255): Remove once input can dispatch against device vs layerstack.