commit 7f8e1eae3f98df29ac00328b6e29234f0dcd2b5d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 13 00:01:47 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 13 00:01:47 2021 +0000
tree 2b0df4b53db8b785780aa22a0e6155d87a12b048
parent 8e62fd2282f35015a1414a9e1ec2b8010f4ebc51
parent 5450ceb552822d270c1eb653973e5595f5183ad6

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

drm/libdrmframework/DrmManagerClientImpl.cpp

diff --git a/drm/libdrmframework/DrmManagerClientImpl.cpp b/drm/libdrmframework/DrmManagerClientImpl.cpp
index a2cac3f..6cb0a99 100644
--- a/drm/libdrmframework/DrmManagerClientImpl.cpp
+++ b/drm/libdrmframework/DrmManagerClientImpl.cpp
@@ -53,10 +53,8 @@
     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()) {