SF: Test coverage for resetDisplayState
Add unit tests to cover SurfaceFlinger::resetDisplayState()
Test: libsurfaceflinger_unittest passes on Pixel XL
Bug: 74827900
Change-Id: Id0f2187612fb0f45f60e0caae91d2b36cdd0fdd9
diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
index f90e2db..2b8a22c 100644
--- a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
+++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
@@ -901,6 +901,55 @@
}
/* ------------------------------------------------------------------------
+ * SurfaceFlinger::resetDisplayState
+ */
+
+TEST_F(DisplayTransactionTest, resetDisplayStateClearsState) {
+ using Case = NonHwcVirtualDisplayCase;
+
+ // --------------------------------------------------------------------
+ // Preconditions
+
+ // vsync is enabled and available
+ mFlinger.mutablePrimaryHWVsyncEnabled() = true;
+ mFlinger.mutableHWVsyncAvailable() = true;
+
+ // A display exists
+ auto existing = Case::Display::makeFakeExistingDisplayInjector(this);
+ existing.inject();
+
+ // --------------------------------------------------------------------
+ // Call Expectations
+
+ // The call disable vsyncs
+ EXPECT_CALL(*mEventControlThread, setVsyncEnabled(false)).Times(1);
+
+ // The call clears the current render engine surface
+ EXPECT_CALL(*mRenderEngine, resetCurrentSurface());
+
+ // --------------------------------------------------------------------
+ // Invocation
+
+ mFlinger.resetDisplayState();
+
+ // --------------------------------------------------------------------
+ // Postconditions
+
+ // vsyncs should be off and not available.
+ EXPECT_FALSE(mFlinger.mutablePrimaryHWVsyncEnabled());
+ EXPECT_FALSE(mFlinger.mutableHWVsyncAvailable());
+
+ // The display should have been removed from the display map.
+ EXPECT_FALSE(hasDisplayDevice(existing.token()));
+
+ // The display should still exist in the current state
+ EXPECT_TRUE(hasCurrentDisplayState(existing.token()));
+
+ // The display should have been removed from the drawing state
+ EXPECT_FALSE(hasDrawingDisplayState(existing.token()));
+}
+
+/* ------------------------------------------------------------------------
* SurfaceFlinger::setupNewDisplayDeviceInternal
*/
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index bfc10a6..b8a3baf 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -66,6 +66,8 @@
auto destroyDisplay(const sp<IBinder>& display) { return mFlinger->destroyDisplay(display); }
+ auto resetDisplayState() { return mFlinger->resetDisplayState(); }
+
auto setupNewDisplayDeviceInternal(const wp<IBinder>& display, int hwcId,
const DisplayDeviceState& state,
const sp<DisplaySurface>& dispSurface,
@@ -98,9 +100,11 @@
auto& mutableEventControlThread() { return mFlinger->mEventControlThread; }
auto& mutableEventQueue() { return mFlinger->mEventQueue; }
auto& mutableEventThread() { return mFlinger->mEventThread; }
+ auto& mutableHWVsyncAvailable() { return mFlinger->mHWVsyncAvailable; }
auto& mutableInterceptor() { return mFlinger->mInterceptor; }
auto& mutableMainThreadId() { return mFlinger->mMainThreadId; }
auto& mutablePendingHotplugEvents() { return mFlinger->mPendingHotplugEvents; }
+ auto& mutablePrimaryHWVsyncEnabled() { return mFlinger->mPrimaryHWVsyncEnabled; }
auto& mutableTransactionFlags() { return mFlinger->mTransactionFlags; }
auto& mutableUseHwcVirtualDisplays() { return mFlinger->mUseHwcVirtualDisplays; }