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

Commit ef0f0817 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "mediaresourcemanager: remove AIDL comparison ops"

parents 5834bf6e 85ff8123

services/mediaresourcemanager/ResourceObserverService.cpp

+0 −8
Original line number Diff line number Diff line
@@ -27,14 +27,6 @@ 


#include "ResourceObserverService.h"



namespace aidl {

namespace android {

namespace media {

bool operator<(const MediaObservableFilter& lhs, const MediaObservableFilter &rhs) {

    return lhs.type < rhs.type || (lhs.type == rhs.type && lhs.eventFilter < rhs.eventFilter);

}

}}} // namespace ::aidl::android::media



namespace android {



using ::aidl::android::media::MediaResourceParcel;

services/mediaresourcemanager/test/ResourceManagerServiceTestUtils.h

+0 −9
Original line number Diff line number Diff line
@@ -23,15 +23,6 @@ 
#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/ProcessInfoInterface.h>



namespace aidl {

namespace android {

namespace media {

bool operator== (const MediaResourceParcel& lhs, const MediaResourceParcel& rhs) {

    return lhs.type == rhs.type && lhs.subType == rhs.subType &&

            lhs.id == rhs.id && lhs.value == rhs.value;

}

}}}



namespace android {



using Status = ::ndk::ScopedAStatus;

services/mediaresourcemanager/test/ResourceObserverService_test.cpp

+0 −8
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ 
#include "ResourceObserverService.h"

#include "ResourceManagerServiceTestUtils.h"



namespace aidl {

namespace android {

namespace media {

bool operator==(const MediaObservableParcel& lhs, const MediaObservableParcel& rhs) {

    return lhs.type == rhs.type && lhs.value == rhs.value;

}

}}} // namespace ::aidl::android::media



namespace android {



using ::aidl::android::media::BnResourceObserver;