commit 6a4921ae044186bf64dab3903e8fead9499fc7f6
author Jeff Tinker <jtinker@google.com> Thu Mar 09 23:26:01 2017 -0800
committer Jeff Tinker <jtinker@google.com> Thu Mar 09 23:26:01 2017 -0800
tree 9458e6876adb556d29dedd38cd196f2a6248c303
parent 89e5a2b102b484fe19dbda2a0b118edfefc70241

Fix mediadrmserver not finding IServiceManager instance

bug: 36113291
Change-Id: I8d459e0edd61555a874cce68e178afd8d468e2e4

drm/libmediadrm/CryptoHal.cpp

diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 1fda06c..e77a8ea 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -112,7 +112,7 @@
 Vector<sp<ICryptoFactory>> CryptoHal::makeCryptoFactories() {
     Vector<sp<ICryptoFactory>> factories;
 
-    auto manager = ::IServiceManager::getService("manager");
+    auto manager = ::IServiceManager::getService();
     if (manager != NULL) {
         manager->listByInterface(ICryptoFactory::descriptor,
                 [&factories](const hidl_vec<hidl_string> &registered) {

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index 595b895..16035c0 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -200,7 +200,7 @@
 Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() {
     Vector<sp<IDrmFactory>> factories;
 
-    auto manager = ::IServiceManager::getService("manager");
+    auto manager = ::IServiceManager::getService();
 
     if (manager != NULL) {
         manager->listByInterface(IDrmFactory::descriptor,