commit 61e009c30f32d51f3ad59f8c2ddd5819f0bf5321
author Mikhail Naganov <mnaganov@google.com> Fri Feb 05 23:30:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 05 23:30:36 2021 +0000
tree 8eae777258c25eb02e1c58f3762533787fd1e043
parent 5c7f8e4d80be29c958531336f16fcfb55d10651f
parent 7707947ae779268fcaf649fbc8c7f75242879ed8

Default Audio HAL service: add V7, remove V2 am: b4443504f1 am: 7707947ae7

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I447808209517c6060fc9b498edf088082ce90e81

audio/common/all-versions/default/service/service.cpp

diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp
index 710ddce..bbc14ad 100644
--- a/audio/common/all-versions/default/service/service.cpp
+++ b/audio/common/all-versions/default/service/service.cpp
@@ -63,17 +63,17 @@
     const std::vector<InterfacesList> mandatoryInterfaces = {
         {
             "Audio Core API",
+            "android.hardware.audio@7.0::IDevicesFactory",
             "android.hardware.audio@6.0::IDevicesFactory",
             "android.hardware.audio@5.0::IDevicesFactory",
             "android.hardware.audio@4.0::IDevicesFactory",
-            "android.hardware.audio@2.0::IDevicesFactory"
         },
         {
             "Audio Effect API",
+            "android.hardware.audio.effect@7.0::IEffectsFactory",
             "android.hardware.audio.effect@6.0::IEffectsFactory",
             "android.hardware.audio.effect@5.0::IEffectsFactory",
             "android.hardware.audio.effect@4.0::IEffectsFactory",
-            "android.hardware.audio.effect@2.0::IEffectsFactory",
         }
     };