commit f68f29b45511798021b46fe765dbce0339c4fd5f
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 19 01:11:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 19 01:11:04 2019 +0000
tree d9e2e151b531af6cc0a34972b57c1c0e9da4959a
parent 6501ae1a72661f2325c1ca97e87fe9c5807d5b91
parent d6db130a2beb0f9f104e7551dc41b09abe255fe0

Merge "Use shared variant of VNDK libmedia_helper"

drm/1.1/vts/functional/drm_hal_clearkey_test.cpp

diff --git a/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
index 7dedd7f..6be30d3 100644
--- a/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
+++ b/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
@@ -24,7 +24,7 @@
 #include <android/hardware/drm/1.0/types.h>
 #include <android/hardware/drm/1.1/types.h>
 #include <android/hidl/allocator/1.0/IAllocator.h>
-#include <android/hidl/manager/1.0/IServiceManager.h>
+#include <android/hidl/manager/1.2/IServiceManager.h>
 #include <gtest/gtest.h>
 #include <hidl/HidlSupport.h>
 #include <hidl/ServiceManagement.h>
@@ -129,9 +129,9 @@
         ALOGD("DrmHalClearkeyTest: Running test %s.%s", test_info->test_case_name(),
                 test_info->name());
 
-        auto manager = android::hardware::defaultServiceManager();
+        auto manager = android::hardware::defaultServiceManager1_2();
         ASSERT_NE(nullptr, manager.get());
-        manager->listByInterface(IDrmFactory::descriptor,
+        manager->listManifestByInterface(IDrmFactory::descriptor,
                 [&](const hidl_vec<hidl_string> &registered) {
                     for (const auto &instance : registered) {
                         sp<IDrmFactory> drmFactory =
@@ -144,7 +144,7 @@
                 }
             );
 
-        manager->listByInterface(ICryptoFactory::descriptor,
+        manager->listManifestByInterface(ICryptoFactory::descriptor,
                 [&](const hidl_vec<hidl_string> &registered) {
                     for (const auto &instance : registered) {
                         sp<ICryptoFactory> cryptoFactory =

graphics/composer/2.4/Android.bp

diff --git a/graphics/composer/2.4/Android.bp b/graphics/composer/2.4/Android.bp
index 4a92df2..0e1bc09 100644
--- a/graphics/composer/2.4/Android.bp
+++ b/graphics/composer/2.4/Android.bp
@@ -4,8 +4,7 @@
     name: "android.hardware.graphics.composer@2.4",
     root: "android.hardware",
     vndk: {
-        // TODO(b/135929065) enable once we are ready to use.
-        enabled: false,
+        enabled: true,
     },
     srcs: [
         "IComposer.hal",