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

Commit 94c72011 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "[Lut screenshot] captureLayers doesn't update `ScreenshotArgs.displayIdVariant`" into main

parents b126d647 fc470d9e

services/surfaceflinger/SurfaceFlinger.cpp

+1 −2
Original line number Diff line number Diff line
@@ -7783,7 +7783,6 @@ status_t SurfaceFlinger::setScreenshotDisplayState(ScreenshotArgs& args) { 
        }



        Rect layerStackSpaceRect = display->getLayerStackSpaceRect();

        args.displayIdVariant = display->getDisplayIdVariant();

        args.isSecure &= display->isSecure();

        args.snapshotRequest.layerStack = display->getLayerStack();

        args.sourceCrop = layerStackSpaceRect;
@@ -7809,7 +7808,6 @@ status_t SurfaceFlinger::setScreenshotDisplayState(ScreenshotArgs& args) { 
        }



        Rect layerStackSpaceRect = display->getLayerStackSpaceRect();

        args.displayIdVariant = display->getDisplayIdVariant();

        args.isSecure &= display->isSecure();

        args.snapshotRequest.layerStack = display->getLayerStack();
@@ -7851,6 +7849,7 @@ status_t SurfaceFlinger::setScreenshotDisplayState(ScreenshotArgs& args) { 
        args.colorMode = state.colorMode;

        args.debugName.append(", ").append(display->getDisplayName());

        args.debugName.append(" (").append(to_string(display->getId())).append(")");

        args.displayIdVariant = display->getDisplayIdVariant();

        return OK;

    }

    ALOGD("Display state not found");