commit 2608138da200690e8e3f993289f7fb6973ce5017
author Lajos Molnar <lajos@google.com> Fri Jan 17 15:11:53 2020 +0000
committer Lajos Molnar <lajos@google.com> Fri Jan 17 15:13:24 2020 +0000
tree 51fea04aa5e1386ca8fcb9c9578d3c19f5c6aa04
parent c6f97aa688537d180a8760133460a75a299b2f01

Revert "Register C2 HAL Service v1.0 instead v1.1"

This reverts commit c6f97aa688537d180a8760133460a75a299b2f01.

Reason for revert: breaks hidl_implementation_test.Hidl#InterfacesImplemented

Bug: 147843370
Change-Id: Ifa2a62de25b3029eda28dc74b2c9b6854f010af1

services/mediacodec/registrant/CodecServiceRegistrant.cpp

diff --git a/services/mediacodec/registrant/CodecServiceRegistrant.cpp b/services/mediacodec/registrant/CodecServiceRegistrant.cpp
index 706ebee..58db801e 100644
--- a/services/mediacodec/registrant/CodecServiceRegistrant.cpp
+++ b/services/mediacodec/registrant/CodecServiceRegistrant.cpp
@@ -20,11 +20,11 @@
 #include <android-base/logging.h>
 
 #include <C2PlatformSupport.h>
-#include <codec2/hidl/1.0/ComponentStore.h>
+#include <codec2/hidl/1.1/ComponentStore.h>
 #include <media/CodecServiceRegistrant.h>
 
 extern "C" void RegisterCodecServices() {
-    using namespace ::android::hardware::media::c2::V1_0;
+    using namespace ::android::hardware::media::c2::V1_1;
     LOG(INFO) << "Creating software Codec2 service...";
     android::sp<IComponentStore> store =
         new utils::ComponentStore(