commit bfaf4810db7a74d8bda7b9629e58bc2198e8b293
author Jeff Tinker <jtinker@google.com> Tue Feb 14 11:39:51 2017 -0800
committer gitbuildkicker <android-build@google.com> Tue Feb 14 14:03:44 2017 -0800
tree 1a4ec318e901167744e8ef29f7018c766a1b9d4b
parent 8207d20afdd3d889fe9054d8c8869a02095218c5

Don't segfault on fail to create drm factory

bug:35329920
Change-Id: Id65254447d76222b78f977f6598751c5c51c87f3
(cherry picked from commit c82b9c335e69b617817dace0ef64ad3df3f5080f)

drm/libmediadrm/DrmHal.cpp

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;
 }