commit e7b14ac46b55f9bbd9ada0a2975448282f22febc
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 13 19:40:11 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 13 19:40:11 2021 +0000
tree 1eaea93ee534691a91c8ef38aab00d46ba7488e4
parent 87fe3939322168542e2125515eba24735e855590
parent 272a39f8397f9912bde77d4513004ee1a21d61a5

Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905, 15560906, 15560769, 15560755, 15557357, 15557358] into sc-release

Change-Id: Iff71c16bb56ca018d104914c376534c0f782ba17

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