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

Commit 1cc934d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "DrmManagerClient: query drm service without blocking" into sc-dev am: 7f8e1eae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15529062

Change-Id: Ia366d3928743c52a2b97ab9753efc95ebb2da539
parents 28b2b98d 7f8e1eae

drm/libdrmframework/DrmManagerClientImpl.cpp

+1 −3
Original line number Diff line number Diff line
@@ -53,10 +53,8 @@ const sp<IDrmManagerService>& DrmManagerClientImpl::getDrmManagerService() { 
    Mutex::Autolock lock(sMutex);

    if (NULL == sDrmManagerService.get()) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder = sm->getService(String16("drm.drmManager"));

        sp<IBinder> binder = sm->checkService(String16("drm.drmManager"));

        if (binder == NULL) {

            // Do NOT retry; IServiceManager already waits for ~5 seconds

            // in getService if a service doesn't yet exist.

            return sDrmManagerService;

        }

        if (NULL == sDeathNotifier.get()) {