commit 593111f4460f2b2e8f541e936670e3577d45fff6
author Jeff Tinker <jtinker@google.com> Thu May 25 16:00:21 2017 -0700
committer Jeff Tinker <jtinker@google.com> Thu May 25 16:00:21 2017 -0700
tree f187a287e5585c6af15e835f195ce2f7bb359c46
parent a666b6980027946c2dfeb8a3529c8e791fc279a4

Don't leak hwservicemanager binders

Use defaultServiceManager() instead of IServiceManager::getService()

bug:62073349
test:
  repeat {launch Play Movies, play a movie, exit} while monitoring
    adb shell cat /sys/kernel/debug/binder/stats |
    grep -A10 '^proc <mediadrmserver PID>'
  --> Make sure number of nodes is stable

Change-Id: Ibea0437ed21a9d58f3eb7ffa9461fb71d9c2b4ab

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,