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