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

Commit 5450ceb5 authored by Robert Shih's avatar Robert Shih Committed by Jeff Tinker
Browse files

DrmManagerClient: query drm service without blocking 

Bug: 194889768
Bug: 195732578
Test: atest DRMTest#testForwardLockAccess
Change-Id: If0165fe89ba69659d9e451c0cf0cc28ca2c70616
parent 7a29a3df

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()) {