commit 7faba5ea99bfa9f76be3f38fd26193fdd56e9485
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 13 02:25:23 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 02:25:25 2017 +0000
tree a7be65d1c32cbf2d8b0389ed9e930e215f1b5a55
parent bc942724f95c6e30e640e33c2b35157367714c1c
parent e309b22bff1719f1fea84b247e4b2bc4c5f09eb5

Merge "Change drm/crypto service names to "default"" into oc-dev

drm/libmediadrm/CryptoHal.cpp

diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 25c16da..d613a5b 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -134,7 +134,7 @@
 
     if (factories.size() == 0) {
         // must be in passthrough mode, load the default passthrough service
-        auto passthrough = ICryptoFactory::getService("crypto");
+        auto passthrough = ICryptoFactory::getService();
         if (passthrough != NULL) {
             ALOGI("makeCryptoFactories: using default crypto instance");
             factories.push_back(passthrough);

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index ddbc83d..3596f12 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -220,7 +220,7 @@
 
     if (factories.size() == 0) {
         // must be in passthrough mode, load the default passthrough service
-        auto passthrough = IDrmFactory::getService("drm");
+        auto passthrough = IDrmFactory::getService();
         if (passthrough != NULL) {
             ALOGI("makeDrmFactories: using default drm instance");
             factories.push_back(passthrough);