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

Commit f80011e8 authored by Minhyeok Yun's avatar Minhyeok Yun Committed by Automerger Merge Worker
Browse files

Merge "Added condition guard on command 'adb shell screenrcord'." into udc-dev...

Merge "Added condition guard on command 'adb shell screenrcord'." into udc-dev am: 2775bd6d am: 470d75da

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



Change-Id: I5fb0b2c4403b53ac3ebaccbf336eb87e3cc29f26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6250de0 470d75da
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -789,6 +789,13 @@ static status_t recordScreen(const char* fileName) {
        return NAME_NOT_FOUND;
    }

    DisplayMode displayMode;
    err = SurfaceComposerClient::getActiveDisplayMode(display, &displayMode);
    if (err != NO_ERROR) {
        fprintf(stderr, "ERROR: unable to get display config\n");
        return err;
    }

    ui::DisplayState displayState;
    err = SurfaceComposerClient::getDisplayState(display, &displayState);
    if (err != NO_ERROR) {
@@ -796,11 +803,9 @@ static status_t recordScreen(const char* fileName) {
        return err;
    }

    DisplayMode displayMode;
    err = SurfaceComposerClient::getActiveDisplayMode(display, &displayMode);
    if (err != NO_ERROR) {
        fprintf(stderr, "ERROR: unable to get display config\n");
        return err;
    if (displayState.layerStack == ui::INVALID_LAYER_STACK) {
        fprintf(stderr, "ERROR: INVALID_LAYER_STACK, please check your display state.\n");
        return INVALID_OPERATION;
    }

    const ui::Size& layerStackSpaceRect = displayState.layerStackSpaceRect;