Revert "Update the audio HAL to @7"

Revert "Upgrade audio and audio.effect HALs"

Revert submission 1804916-emulator-audio7

Reason for revert: Broken test (http://b/197715978)
Reverted Changes:
I92675c2ec:Update the audio HAL to @7
If878215f7:Upgrade audio and audio.effect HALs

Change-Id: I856ca03bdf86efd993b077186a05e924fd5e70b0

1 files changed, 7 insertions, 9 deletions

diff --git a/audio/device_port_source.h b/audio/device_port_source.h
index 7f61757b..16b5d27c 100644
--- a/audio/device_port_source.h
+++ b/audio/device_port_source.h
@@ -16,18 +16,18 @@
 
 #pragma once
 #include <memory>
-#include <android/hardware/audio/common/7.0/types.h>
-#include <android/hardware/audio/7.0/types.h>
+#include <android/hardware/audio/common/6.0/types.h>
+#include <android/hardware/audio/6.0/types.h>
 #include "iwriter.h"
 
 namespace android {
 namespace hardware {
 namespace audio {
-namespace V7_0 {
+namespace V6_0 {
 namespace implementation {
 
-using namespace ::android::hardware::audio::common::V7_0;
-using namespace ::android::hardware::audio::V7_0;
+using namespace ::android::hardware::audio::common::V6_0;
+using namespace ::android::hardware::audio::V6_0;
 
 struct DevicePortSource {
     virtual ~DevicePortSource() {}
@@ -37,14 +37,12 @@ struct DevicePortSource {
     static std::unique_ptr<DevicePortSource> create(size_t writerBufferSizeHint,
                                                     const DeviceAddress &,
                                                     const AudioConfig &,
-                                                    const hidl_vec<AudioInOutFlag> &,
+                                                    const hidl_bitfield<AudioOutputFlag> &,
                                                     uint64_t &frames);
-
-    static bool validateDeviceAddress(const DeviceAddress &);
 };
 
 }  // namespace implementation
-}  // namespace V7_0
+}  // namespace V6_0
 }  // namespace audio
 }  // namespace hardware
 }  // namespace android