Merge "Check if bootmode tests were skipped before teardown" into main (a15e40e3) · Commits · e / os / android_frameworks_native

services/surfaceflinger/tests/BootDisplayMode_test.cpp

+9 −7

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ protected:
		}

		void TearDown() override {
		if (!IsSkipped()) {
		binder::Status status = mSf->setBootDisplayMode(mDisplayToken, mOldMode);
		EXPECT_EQ(NO_ERROR, statusTFromBinderStatus(status));

		@@ -73,6 +74,7 @@ protected:
		EXPECT_EQ(NO_ERROR, statusTFromBinderStatus(status));
		EXPECT_EQ(mOldMode, info.preferredBootDisplayMode);
		}
		}

		ui::DisplayModeId mOldMode;
		ui::DisplayModeId mNewMode;