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

Commit fb83d846 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "Fix calls to captureScreen"

parents da03fe4b 8d759963

libs/gui/tests/Surface_test.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ TEST_F(SurfaceTest, ScreenshotsOfProtectedBuffersSucceed) { 
    sp<ISurfaceComposer> sf(ComposerService::getComposerService());

    sp<ISurfaceComposer> sf(ComposerService::getComposerService());

    sp<IBinder> display(sf->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain));

    sp<IBinder> display(sf->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain));

    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq,

    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq,

            64, 64, 0, 0x7fffffff));

            64, 64, 0, 0x7fffffff, false));





    // Set the PROTECTED usage bit and verify that the screenshot fails.  Note

    // Set the PROTECTED usage bit and verify that the screenshot fails.  Note

    // that we need to dequeue a buffer in order for it to actually get

    // that we need to dequeue a buffer in order for it to actually get
@@ -122,7 +122,7 @@ TEST_F(SurfaceTest, ScreenshotsOfProtectedBuffersSucceed) { 
        ASSERT_EQ(NO_ERROR, anw->queueBuffer(anw.get(), buf, -1));

        ASSERT_EQ(NO_ERROR, anw->queueBuffer(anw.get(), buf, -1));

    }

    }

    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq,

    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq,

            64, 64, 0, 0x7fffffff));

            64, 64, 0, 0x7fffffff, false));

}

}





TEST_F(SurfaceTest, ConcreteTypeIsSurface) {

TEST_F(SurfaceTest, ConcreteTypeIsSurface) {