Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 997812b9 authored by zhangweiwei's avatar zhangweiwei Committed by robertchou
Browse files

Adapt change clearkey to Lazy hal 

Exempt-From-Owner-Approval

Bug:135896867
Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target

Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
parent 9ec8f5c6

drm/1.1/vts/functional/drm_hal_clearkey_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ public: 
        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 @@ public: 
                }

            );



        manager->listByInterface(ICryptoFactory::descriptor,

        manager->listManifestByInterface(ICryptoFactory::descriptor,

                [&](const hidl_vec<hidl_string> &registered) {

                    for (const auto &instance : registered) {

                        sp<ICryptoFactory> cryptoFactory =