| commit | 23db2486baec1b7fcd9a8a0bd9c6df0adf1c7f32 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Tue Feb 14 21:53:14 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 14 21:53:14 2017 +0000 |
| tree | cc1961097551f12cbf3a37ad4103daa980effecc | |
| parent | 053a77da74c3366f7dbb6e2c12189be7595bef2b [diff] | |
| parent | c82b9c335e69b617817dace0ef64ad3df3f5080f [diff] |
Merge "Don't segfault on fail to create drm factory"
diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp index 4ef1f47..73dc93b 100644 --- a/drm/libmediadrm/DrmHal.cpp +++ b/drm/libmediadrm/DrmHal.cpp
@@ -201,9 +201,12 @@ sp<IDrmFactory> factory = IDrmFactory::getService("drm"); if (factory == NULL) { ALOGE("Failed to make drm factory"); + return NULL; } + ALOGD("makeDrmFactory: service is %s", factory->isRemote() ? "Remote" : "Not Remote"); + return factory; }