commit a4cfeca69f76fbd2eedd6217b058d118844a5d4c
author Juju Sung <juju.sung@mediatek.com> Fri Apr 10 15:02:32 2020 +0800
committer Robert Shih <robertshih@google.com> Wed Apr 15 15:33:46 2020 -0700
tree 6142f636d133028244ab1c3e49f48fa6ebd1e41c
parent 01d9c845f00cae661e1764162f36d5156871a60b

Support drm lazy hal

Use listManifestByInterface in v1.2 servicemanager to list all
instances of drm service from the manifest. If it's lazy hal, the
service will be started as lazy hal service in getService.

Test: Play secure video in ExoPlayer
Bug: 153636761
Change-Id: Ifda4c9c433cfc1cd38980b10b8641f1db4460773

drm/libmediadrm/DrmUtils.cpp

diff --git a/drm/libmediadrm/DrmUtils.cpp b/drm/libmediadrm/DrmUtils.cpp
index 51c2e24..d85fa61 100644
--- a/drm/libmediadrm/DrmUtils.cpp
+++ b/drm/libmediadrm/DrmUtils.cpp
@@ -27,7 +27,7 @@
 #include <android/hardware/drm/1.2/IDrmFactory.h>
 #include <android/hardware/drm/1.3/ICryptoFactory.h>
 #include <android/hardware/drm/1.3/IDrmFactory.h>
-#include <android/hidl/manager/1.0/IServiceManager.h>
+#include <android/hidl/manager/1.2/IServiceManager.h>
 #include <hidl/HidlSupport.h>
 
 #include <utils/Errors.h>
@@ -41,7 +41,7 @@
 #include <mediadrm/ICrypto.h>
 #include <mediadrm/IDrm.h>
 
-using HServiceManager = ::android::hidl::manager::V1_0::IServiceManager;
+using HServiceManager = ::android::hidl::manager::V1_2::IServiceManager;
 using ::android::hardware::hidl_array;
 using ::android::hardware::hidl_string;
 using ::android::hardware::hidl_vec;
@@ -72,7 +72,7 @@
         exit(-1);
     }
 
-    serviceManager->listByInterface(Hal::descriptor, [&](const hidl_vec<hidl_string> &registered) {
+    serviceManager->listManifestByInterface(Hal::descriptor, [&](const hidl_vec<hidl_string> &registered) {
         for (const auto &instance : registered) {
             auto factory = Hal::getService(instance);
             if (factory != nullptr) {