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

Commit 9def9b95 authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

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

parents a9781eed de42a92e

services/audioflinger/timing/tests/mediasyncevent_tests.cpp

+2 −3
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 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 {};
@@ -67,5 +66,5 @@ TEST(MediaSyncEventTests, Basic) { 
    syncEvent->cancel();

    ASSERT_TRUE(syncEvent->isCancelled());

}

#pragma clang diagnostic pop



} // namespace

services/audioflinger/timing/tests/synchronizedrecordstate_tests.cpp

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


namespace {



#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"

TEST(SynchronizedRecordStateTests, Basic) {

    struct Cookie : public RefBase {};
@@ -76,5 +74,5 @@ TEST(SynchronizedRecordStateTests, Basic) { 
    ASSERT_FALSE(triggered);

    ASSERT_TRUE(syncEvent->isCancelled());

}

#pragma clang diagnostic pop



}