commit 2c37787ed7685c2dfaf659b4d2ffa4370279987f
author Robert Shih <robertshih@google.com> Sun Nov 24 22:17:46 2019 -0800
committer Robert Shih <robertshih@google.com> Thu Feb 06 06:54:55 2020 +0000
tree 4e3474fcb778afe2e8927dc82adc6cde14772eb1
parent b495377cac061d5856f0666b69bef42fdd244fb1

DrmUtils: return 1.3 hidl factories

Bug: 139134043
Test: MediaDrmGenericOpsTest
Change-Id: I0447758344432eff84bd5221e575f9dca3db56d4

drm/libmediadrm/Android.bp

diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp
index 255640f..802e2c4 100644
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@@ -50,6 +50,7 @@
         "android.hardware.drm@1.0",
         "android.hardware.drm@1.1",
         "android.hardware.drm@1.2",
+        "android.hardware.drm@1.3",
         "libhidlallocatorutils",
         "libhidlbase",
     ],

drm/libmediadrm/DrmUtils.cpp

diff --git a/drm/libmediadrm/DrmUtils.cpp b/drm/libmediadrm/DrmUtils.cpp
index 3549637..51c2e24 100644
--- a/drm/libmediadrm/DrmUtils.cpp
+++ b/drm/libmediadrm/DrmUtils.cpp
@@ -25,6 +25,8 @@
 #include <android/hardware/drm/1.1/IDrmFactory.h>
 #include <android/hardware/drm/1.2/ICryptoFactory.h>
 #include <android/hardware/drm/1.2/IDrmFactory.h>
+#include <android/hardware/drm/1.3/ICryptoFactory.h>
+#include <android/hardware/drm/1.3/IDrmFactory.h>
 #include <android/hidl/manager/1.0/IServiceManager.h>
 #include <hidl/HidlSupport.h>
 
@@ -144,6 +146,7 @@
     MakeHidlFactories<::V1_0::IDrmFactory>(uuid, drmFactories);
     MakeHidlFactories<::V1_1::IDrmFactory>(uuid, drmFactories);
     MakeHidlFactories<::V1_2::IDrmFactory>(uuid, drmFactories);
+    MakeHidlFactories<::V1_3::IDrmFactory>(uuid, drmFactories);
     return drmFactories;
 }
 
@@ -161,6 +164,7 @@
     MakeHidlFactories<::V1_0::ICryptoFactory>(uuid, cryptoFactories);
     MakeHidlFactories<::V1_1::ICryptoFactory>(uuid, cryptoFactories);
     MakeHidlFactories<::V1_2::ICryptoFactory>(uuid, cryptoFactories);
+    MakeHidlFactories<::V1_3::ICryptoFactory>(uuid, cryptoFactories);
     return cryptoFactories;
 }