Use aidl interface for Widevine service.
The interface is defined in hardware/interfaces/drm/aidl(http://go/ag/15329852). Test: build m android.hardware.drm-service.widevine -j128 Test: build_and_run_all_unit_tests.sh for hidl tests Test: atest VtsAidlHalDrmTargetTest Test: atest vts_treble_vintf_vendor_test:vts_treble_vintf_vendor_test.DeviceManifest/SingleManifestTest#ManifestAidlHalsServed/0 -- --abi x86_64 Bug: 200055138 Bug: 170964303 Change-Id: I5654d90d8a4b0bae4b4a78e79b27c1cafec36be7
This commit is contained in:
@@ -4,7 +4,10 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <limits.h>
|
||||
#include <utils/Thread.h>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
@@ -284,7 +287,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
|
||||
CdmAppParameterMap app_parameters;
|
||||
CdmKeyRequest key_request;
|
||||
const std::string init_data_type = "video/mp4";
|
||||
if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) {
|
||||
if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) {
|
||||
InitializationData parsed_init_data(init_data_type, init_data);
|
||||
parsed_init_data.DumpToLogs();
|
||||
}
|
||||
@@ -681,7 +684,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
|
||||
EXPECT_TRUE(StringToInt64(query_info[key], playback_duration_remaining));
|
||||
}
|
||||
|
||||
uint32_t QueryStatus(SecurityLevel security_level, const std::string& key) {
|
||||
uint32_t QueryStatus(RequestedSecurityLevel security_level, const std::string& key) {
|
||||
std::string str;
|
||||
EXPECT_EQ(wvcdm::NO_ERROR,
|
||||
decryptor_->QueryStatus(security_level, key, &str));
|
||||
|
||||
Reference in New Issue
Block a user