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

Commit a8f4b13e authored Jul 07, 2023 by Treehugger Robot Committed by Automerger Merge Worker Jul 07, 2023

Merge "Fix the Wenum-constexpr-conversion error" into main am: 46a894dc am:...

Merge "Fix the Wenum-constexpr-conversion error" into main am: 46a894dc am: afd9c218 am: a61556a4 am: 63a1aa7a am: b943de5f am: 09053057

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2651060

Change-Id: I7a99f2f9b5f1df7a583f5da5fe812ca8a71b8b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1a4eaaa4 09053057

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 {};

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

		#pragma clang diagnostic pop
		}