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

Commit c77b3bb4 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 

am: d2b26cd8

Change-Id: I237e0f1cd7160ab8054a0caaeb1f78cbbef09bcc
parents 3646bc8d d2b26cd8

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,