commit 6571bf6fadf7517d4a6f213225c1d214cedb2e68
author Robert Shih <robertshih@google.com> Sun Nov 10 15:03:01 2019 -0800
committer Robert Shih <robertshih@google.com> Tue Nov 12 21:51:48 2019 -0800
tree e343f97d4f444282402924435985ae529407fc6d
parent e62c35eb8c93530e202609aae66b682c8218a9b1

IMediaDrmService: remove makeDrm method

This means IDrm will always be local.

Bug: 134787536
Test: GtsMediaTestCases
Change-Id: I291cca47b97c3f5da40e750bd339693268b46ba0

drm/libmediadrm/DrmUtils.cpp

diff --git a/drm/libmediadrm/DrmUtils.cpp b/drm/libmediadrm/DrmUtils.cpp
index 66991bd..3a76591 100644
--- a/drm/libmediadrm/DrmUtils.cpp
+++ b/drm/libmediadrm/DrmUtils.cpp
@@ -27,8 +27,6 @@
 #include <utils/Errors.h>
 #include <utils/Log.h>
 #include <utils/String16.h>
-#include <binder/IInterface.h>
-#include <binder/IServiceManager.h>
 #include <cutils/properties.h>
 
 #include <mediadrm/CryptoHal.h>
@@ -36,7 +34,6 @@
 #include <mediadrm/DrmUtils.h>
 #include <mediadrm/ICrypto.h>
 #include <mediadrm/IDrm.h>
-#include <mediadrm/IMediaDrmService.h>
 
 using HServiceManager = ::android::hidl::manager::V1_0::IServiceManager;
 using ::android::hardware::hidl_array;
@@ -48,25 +45,12 @@
 namespace DrmUtils {
 
 namespace {
-template<typename Iface>
-sp<Iface> MakeObjectWithService(status_t *pstatus) {
+
+template<typename Hal>
+Hal *MakeObject(status_t *pstatus) {
     status_t err = OK;
     status_t &status = pstatus ? *pstatus : err;
-    sp<IServiceManager> sm = defaultServiceManager();
-    sp<IBinder> binder = sm->getService(String16("media.drm"));
-
-    sp<IMediaDrmService> service = interface_cast<IMediaDrmService>(binder);
-    if (service == NULL) {
-        status = UNKNOWN_ERROR;
-        return NULL;
-    }
-
-    auto obj = service->makeObject<Iface>();
-    if (obj == NULL) {
-        status = UNKNOWN_ERROR;
-        return NULL;
-    }
-
+    auto obj = new Hal();
     status = obj->initCheck();
     if (status != OK && status != NO_INIT) {
         return NULL;
@@ -74,15 +58,6 @@
     return obj;
 }
 
-template<typename Iface, typename Hal>
-sp<Iface> MakeObject(status_t *pstatus) {
-    if (UseDrmService()) {
-        return MakeObjectWithService<Iface>(pstatus);
-    } else {
-        return new Hal();
-    }
-}
-
 template <typename Hal, typename V>
 void MakeCryptoFactories(const uint8_t uuid[16], V &cryptoFactories) {
     sp<HServiceManager> serviceManager = HServiceManager::getService();
@@ -140,14 +115,11 @@
 }
 
 sp<IDrm> MakeDrm(status_t *pstatus) {
-    return MakeObject<IDrm, DrmHal>(pstatus);
+    return MakeObject<DrmHal>(pstatus);
 }
 
 sp<ICrypto> MakeCrypto(status_t *pstatus) {
-    if (pstatus) {
-        *pstatus = OK;
-    }
-    return new CryptoHal();
+    return MakeObject<CryptoHal>(pstatus);
 }
 
 std::vector<sp<::V1_0::ICryptoFactory>> MakeCryptoFactories(const uint8_t uuid[16]) {