widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose status, add backward compat in tests and remove unused code"

Browse Source
This commit is contained in:
Rahul Frias
2015-09-26 01:19:57 +00:00
committed by Android (Google) Code Review
parent 9c43416e13 ba95515ae0
commit d5e3c89be8
6 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/cdm/core/test/device_files_unittest.cpp
View File

@@ -1634,7 +1634,9 @@ TEST_P(DeviceCertificateTest, ReadCertificate) {
Return(data.size())));
EXPECT_CALL(file, Close()).Times(1);
EXPECT_CALL(file, Write(_, _)).Times(0);
EXPECT_CALL(file, List(_, NotNull())).WillOnce(Return(false));
if (Properties::security_level_path_backward_compatibility_support()) {
EXPECT_CALL(file, List(_, NotNull())).WillOnce(Return(false));
}
DeviceFiles device_files;
EXPECT_TRUE(device_files.Init(kSecurityLevelL1));
@@ -1926,6 +1928,10 @@ TEST_F(DeviceFilesTest, AppParametersBackwardCompatibility) {
}
TEST_F(DeviceFilesTest, SecurityLevelPathBackwardCompatibility) {
if (!Properties::security_level_path_backward_compatibility_support()) {
return;
}
MockFile file;
std::vector<std::string> security_dirs;
EXPECT_TRUE(Properties::GetSecurityLevelDirectories(&security_dirs));