Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2b26cd8 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

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

am: ac1b8602

Change-Id: Ic3efcf36ca42632bb33c1f7ebb3da0b208b59bf0
parents 610aa7fb ac1b8602

drm/libmediadrm/DrmHal.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ DrmHal::~DrmHal() { 
Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() {

    Vector<sp<IDrmFactory>> factories;



    auto manager = ::IServiceManager::getService();

    auto manager = hardware::defaultServiceManager();



    if (manager != NULL) {

        manager->listByInterface(IDrmFactory::descriptor,