commit c0d1d0eeb4b94c13c8dd508b8136d8e1d95a59ac
author Robert Shih <robertshih@google.com> Sun Nov 24 13:21:04 2019 -0800
committer Robert Shih <robertshih@google.com> Wed Nov 27 13:19:56 2019 -0800
tree 39fb8d37db955d523bf231ffcbf248b6109a4980
parent 0564f53084007a2358f95a9cb063befbf81a9d5a

DrmHal: use DrmUtils to create IDrmFactories

Bug: 134787536
Test: MediaDrmClearkeyTest
Change-Id: I7b269b6888b925f109b2a6a378fc15e675fc011a

drm/libmediadrm/include/mediadrm/DrmHal.h

diff --git a/drm/libmediadrm/include/mediadrm/DrmHal.h b/drm/libmediadrm/include/mediadrm/DrmHal.h
index 6818dd7..3b4639b 100644
--- a/drm/libmediadrm/include/mediadrm/DrmHal.h
+++ b/drm/libmediadrm/include/mediadrm/DrmHal.h
@@ -198,7 +198,7 @@
     mutable Mutex mEventLock;
     mutable Mutex mNotifyLock;
 
-    const Vector<sp<IDrmFactory>> mFactories;
+    const std::vector<sp<IDrmFactory>> mFactories;
     sp<IDrmPlugin> mPlugin;
     sp<drm::V1_1::IDrmPlugin> mPluginV1_1;
     sp<drm::V1_2::IDrmPlugin> mPluginV1_2;
@@ -219,7 +219,7 @@
      */
     status_t mInitCheck;
 
-    Vector<sp<IDrmFactory>> makeDrmFactories();
+    std::vector<sp<IDrmFactory>> makeDrmFactories();
     sp<IDrmPlugin> makeDrmPlugin(const sp<IDrmFactory>& factory,
             const uint8_t uuid[16], const String8& appPackageName);