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

Commit 46a894dc authored Jul 07, 2023 by Treehugger Robot Committed by Gerrit Code Review Jul 07, 2023

Merge "Fix the Wenum-constexpr-conversion error" into main

parents ef703eef 7c275a89

services/audioflinger/timing/tests/mediasyncevent_tests.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,8 @@ using namespace android;
		using namespace android::audioflinger;

		namespace {

		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"
		TEST(MediaSyncEventTests, Basic) {
		struct Cookie : public RefBase {};

		@@ -66,5 +67,5 @@ TEST(MediaSyncEventTests, Basic) {
		syncEvent->cancel();
		ASSERT_TRUE(syncEvent->isCancelled());
		}

		#pragma clang diagnostic pop
		} // namespace

services/audioflinger/timing/tests/synchronizedrecordstate_tests.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ using namespace android::audioflinger;

		namespace {

		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"
		TEST(SynchronizedRecordStateTests, Basic) {
		struct Cookie : public RefBase {};

		@@ -73,5 +75,5 @@ TEST(SynchronizedRecordStateTests, Basic) {
		ASSERT_FALSE(triggered);
		ASSERT_TRUE(syncEvent->isCancelled());
		}

		#pragma clang diagnostic pop
		}