Fixes for usage table upgrades
[ Merge of http://go/wvgerrit/34060 ] License were not being upgraded successfully from usage tables to usage table headers and entries (big usage tables). Bug: 65730713 Test: WV unit/integration tests Test: GTSMediaDrmTests Test: Playback using netflix and play movies Test: Manual upgrade from N (L3) Change-Id: I7ef127204104fa36dd1ee385bc80ed6a81172b4b
This commit is contained in:
@@ -15,14 +15,6 @@
|
||||
#include "log.h"
|
||||
#include "properties.h"
|
||||
|
||||
namespace {
|
||||
const char* kSecurityLevelPathCompatibilityExclusionList[] = {
|
||||
"ay64.dat", "ay64.dat2", "ay64.dat3"};
|
||||
size_t kSecurityLevelPathCompatibilityExclusionListSize =
|
||||
sizeof(kSecurityLevelPathCompatibilityExclusionList) /
|
||||
sizeof(*kSecurityLevelPathCompatibilityExclusionList);
|
||||
} // namespace
|
||||
|
||||
namespace wvcdm {
|
||||
|
||||
bool IsCurrentOrParentDirectory(char* dir) {
|
||||
@@ -258,15 +250,6 @@ void FileUtils::SecurityLevelPathBackwardCompatibility(
|
||||
|
||||
for (size_t i = 0; i < files.size(); ++i) {
|
||||
std::string from = from_dir + files[i];
|
||||
bool exclude = false;
|
||||
for (size_t j = 0; j < kSecurityLevelPathCompatibilityExclusionListSize;
|
||||
++j) {
|
||||
if (files[i] == kSecurityLevelPathCompatibilityExclusionList[j]) {
|
||||
exclude = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (exclude) continue;
|
||||
if (!FileUtils::IsRegularFile(from)) continue;
|
||||
|
||||
for (size_t j = 0; j < security_dirs.size(); ++j) {
|
||||
|
||||
Reference in New Issue
Block a user