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

Commit 91bb86e5 authored by Michael Butler's avatar Michael Butler Committed by android-build-merger
Browse files

Merge "Connecting to BufferQueue before setting surface." into oc-dev am: e7375c07

am: 662493ce

Change-Id: I40e4a9cb1e70f4cb380108e2db5117062f06f307
parents 230ea381 662493ce
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ TEST_F(RenderscriptHidlTest, NativeWindowIoTest) {
    ASSERT_NE(NativeWindow(0), nativeWindow);

    ((ANativeWindow *)nativeWindow)->incStrong(nullptr);
    native_window_api_connect((ANativeWindow*)nativeWindow,
                              NATIVE_WINDOW_API_CPU);

    context->allocationSetNativeWindow(allocationSend, nativeWindow);
    context->allocation2DWrite(allocationSend, 0, 0, 0, AllocationCubemapFace::POSITIVE_X, 512, 512,
@@ -239,6 +241,8 @@ TEST_F(RenderscriptHidlTest, BufferQueueTest) {
    EXPECT_EQ(nativeWindow2, nativeWindow1);

    ((ANativeWindow *)nativeWindow1)->incStrong(nullptr);
    native_window_api_connect((ANativeWindow*)nativeWindow1,
                              NATIVE_WINDOW_API_CPU);

    context->allocationSetNativeWindow(allocationSend, nativeWindow1);
    context->allocation2DWrite(allocationSend, 0, 0, 0, AllocationCubemapFace::POSITIVE_X, 512, 512,