Revert "Set up Multi-HAL for Sensors HAL 2.1"

Revert submission 10501254-multihal_2_1



Reason for revert: Droidcop: Potential culprit for b/155328660 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 155328660
Reverted Changes:
I2be51568b:Update tests for multihal to test HAL 2.1
Id5ab7b606:Create Multi-HAL 2.1 service
Icefae8c12:Set up Multi-HAL for Sensors HAL 2.1

Change-Id: I21176759d45972cde3221cb462934fc1d7bd88c2

1 files changed, 0 insertions, 36 deletions

diff --git a/sensors/common/utils/EventMessageQueueWrapper.h b/sensors/common/utils/EventMessageQueueWrapper.h
index c4f92c8386..bf3261ffbc 100644
--- a/sensors/common/utils/EventMessageQueueWrapper.h
+++ b/sensors/common/utils/EventMessageQueueWrapper.h
@@ -39,14 +39,8 @@ class EventMessageQueueWrapperBase : public RefBase {
 
     virtual std::atomic<uint32_t>* getEventFlagWord() = 0;
     virtual size_t availableToRead() = 0;
-    virtual size_t availableToWrite() = 0;
     virtual bool read(V2_1::Event* events, size_t numToRead) = 0;
-    virtual bool write(const V2_1::Event* events, size_t numToWrite) = 0;
     virtual bool write(const std::vector<V2_1::Event>& events) = 0;
-    virtual bool writeBlocking(const V2_1::Event* events, size_t count, uint32_t readNotification,
-                               uint32_t writeNotification, int64_t timeOutNanos,
-                               android::hardware::EventFlag* evFlag) = 0;
-    virtual size_t getQuantumCount() = 0;
 };
 
 class EventMessageQueueWrapperV1_0 : public EventMessageQueueWrapperBase {
@@ -66,30 +60,15 @@ class EventMessageQueueWrapperV1_0 : public EventMessageQueueWrapperBase {
 
     virtual size_t availableToRead() override { return mQueue->availableToRead(); }
 
-    size_t availableToWrite() override { return mQueue->availableToWrite(); }
-
     virtual bool read(V2_1::Event* events, size_t numToRead) override {
         return mQueue->read(reinterpret_cast<V1_0::Event*>(events), numToRead);
     }
 
-    bool write(const V2_1::Event* events, size_t numToWrite) override {
-        return mQueue->write(reinterpret_cast<const V1_0::Event*>(events), numToWrite);
-    }
-
     virtual bool write(const std::vector<V2_1::Event>& events) override {
         const std::vector<V1_0::Event>& oldEvents = convertToOldEvents(events);
         return mQueue->write(oldEvents.data(), oldEvents.size());
     }
 
-    bool writeBlocking(const V2_1::Event* events, size_t count, uint32_t readNotification,
-                       uint32_t writeNotification, int64_t timeOutNanos,
-                       android::hardware::EventFlag* evFlag) override {
-        return mQueue->writeBlocking(reinterpret_cast<const V1_0::Event*>(events), count,
-                                     readNotification, writeNotification, timeOutNanos, evFlag);
-    }
-
-    size_t getQuantumCount() override { return mQueue->getQuantumCount(); }
-
   private:
     std::unique_ptr<EventMessageQueue> mQueue;
 };
@@ -109,29 +88,14 @@ class EventMessageQueueWrapperV2_1 : public EventMessageQueueWrapperBase {
 
     virtual size_t availableToRead() override { return mQueue->availableToRead(); }
 
-    size_t availableToWrite() override { return mQueue->availableToWrite(); }
-
     virtual bool read(V2_1::Event* events, size_t numToRead) override {
         return mQueue->read(events, numToRead);
     }
 
-    bool write(const V2_1::Event* events, size_t numToWrite) override {
-        return mQueue->write(events, numToWrite);
-    }
-
     bool write(const std::vector<V2_1::Event>& events) override {
         return mQueue->write(events.data(), events.size());
     }
 
-    bool writeBlocking(const V2_1::Event* events, size_t count, uint32_t readNotification,
-                       uint32_t writeNotification, int64_t timeOutNanos,
-                       android::hardware::EventFlag* evFlag) override {
-        return mQueue->writeBlocking(events, count, readNotification, writeNotification,
-                                     timeOutNanos, evFlag);
-    }
-
-    size_t getQuantumCount() override { return mQueue->getQuantumCount(); }
-
   private:
     std::unique_ptr<EventMessageQueue> mQueue;
 };