commit ac1b860260d99455d60f99b11c24b83f339031fc
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 26 01:17:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 26 01:17:54 2017 +0000
tree 975ad0fb00640ef99efc6feb1ba50d004857a50d
parent 4d351037a53438ca0355efe6a845d29e3ef11bec
parent 593111f4460f2b2e8f541e936670e3577d45fff6

Merge "Don't leak hwservicemanager binders" into oc-dev

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index f54954a..e1718eb 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -25,6 +25,7 @@
 #include <android/hardware/drm/1.0/IDrmPlugin.h>
 #include <android/hardware/drm/1.0/types.h>
 #include <android/hidl/manager/1.0/IServiceManager.h>
+#include <hidl/ServiceManagement.h>
 
 #include <media/DrmHal.h>
 #include <media/DrmSessionClientInterface.h>
@@ -200,7 +201,7 @@
 Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() {
     Vector<sp<IDrmFactory>> factories;
 
-    auto manager = ::IServiceManager::getService();
+    auto manager = hardware::defaultServiceManager();
 
     if (manager != NULL) {
         manager->listByInterface(IDrmFactory::descriptor,