| commit | 1cc934d85d2c29a06bda32e3e85431274de23a8e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 13 00:16:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 00:16:40 2021 +0000 |
| tree | 2b0df4b53db8b785780aa22a0e6155d87a12b048 | |
| parent | 28b2b98d86c747ffc792846bae1681ba122a9f00 [diff] | |
| parent | 7f8e1eae3f98df29ac00328b6e29234f0dcd2b5d [diff] |
Merge "DrmManagerClient: query drm service without blocking" into sc-dev am: 7f8e1eae3f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15529062 Change-Id: Ia366d3928743c52a2b97ab9753efc95ebb2da539
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()) {