4c09a4a4f7
Overlayable policies were not being passed correctly to idmap2 create from scan. This fixes that and adds better error messages for when policy failures occur. Bug: 127860892 Test: manual Change-Id: I8fae20884a75f4c57a0eb4aafdb4e09da3ebaf93
82 lines
2.3 KiB
C++
82 lines
2.3 KiB
C++
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <iterator>
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "androidfw/ResourceTypes.h"
|
|
|
|
#include "idmap2/Idmap.h"
|
|
#include "idmap2/Policies.h"
|
|
#include "idmap2/Result.h"
|
|
|
|
namespace android::idmap2 {
|
|
|
|
namespace {
|
|
|
|
const std::map<android::StringPiece, PolicyFlags> kStringToFlag = {
|
|
{kPolicyPublic, PolicyFlags::POLICY_PUBLIC},
|
|
{kPolicyProduct, PolicyFlags::POLICY_PRODUCT_PARTITION},
|
|
{kPolicySystem, PolicyFlags::POLICY_SYSTEM_PARTITION},
|
|
{kPolicyVendor, PolicyFlags::POLICY_VENDOR_PARTITION},
|
|
{kPolicySignature, PolicyFlags::POLICY_SIGNATURE},
|
|
};
|
|
|
|
} // namespace
|
|
|
|
Result<PolicyBitmask> PoliciesToBitmask(const std::vector<std::string>& policies) {
|
|
PolicyBitmask bitmask = 0;
|
|
for (const std::string& policy : policies) {
|
|
const auto iter = kStringToFlag.find(policy);
|
|
if (iter != kStringToFlag.end()) {
|
|
bitmask |= iter->second;
|
|
} else {
|
|
return Error("unknown policy \"%s\"", policy.c_str());
|
|
}
|
|
}
|
|
|
|
return Result<PolicyBitmask>(bitmask);
|
|
}
|
|
|
|
std::vector<std::string> BitmaskToPolicies(const PolicyBitmask& bitmask) {
|
|
std::vector<std::string> policies;
|
|
if ((bitmask & PolicyFlags::POLICY_PUBLIC) != 0) {
|
|
policies.emplace_back(kPolicyPublic);
|
|
}
|
|
|
|
if ((bitmask & PolicyFlags::POLICY_PRODUCT_PARTITION) != 0) {
|
|
policies.emplace_back(kPolicyProduct);
|
|
}
|
|
|
|
if ((bitmask & PolicyFlags::POLICY_SYSTEM_PARTITION) != 0) {
|
|
policies.emplace_back(kPolicySystem);
|
|
}
|
|
|
|
if ((bitmask & PolicyFlags::POLICY_VENDOR_PARTITION) != 0) {
|
|
policies.emplace_back(kPolicyVendor);
|
|
}
|
|
|
|
if ((bitmask & PolicyFlags::POLICY_SIGNATURE) != 0) {
|
|
policies.emplace_back(kPolicySignature);
|
|
}
|
|
|
|
return policies;
|
|
}
|
|
|
|
} // namespace android::idmap2
|