Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't use initializer_list as return type"

Browse Source 
am: 9c6b9bf7c3

Change-Id: Ided6c9a8952938912bf036b4c83544a568088e42
This commit is contained in:
Yi Kong
2018-09-24 14:32:46 -07:00
committed by android-build-merger
parent 75ba0bfc0b 9c6b9bf7c3
commit fa8dfc724e
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keymaster/4.0/support/authorization_set.cpp
View File

@@ -523,8 +523,7 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::BlockMode(
return *this;
}
AuthorizationSetBuilder& AuthorizationSetBuilder::Digest(
std::initializer_list<V4_0::Digest> digests) {
AuthorizationSetBuilder& AuthorizationSetBuilder::Digest(std::vector<V4_0::Digest> digests) {
for (auto digest : digests) {
push_back(TAG_DIGEST, digest);
}

2
keymaster/4.0/support/include/keymasterV4_0/authorization_set.h
View File

@@ -278,7 +278,7 @@ class AuthorizationSetBuilder : public AuthorizationSet {
AuthorizationSetBuilder& GcmModeMacLen(uint32_t macLength);
AuthorizationSetBuilder& BlockMode(std::initializer_list<BlockMode> blockModes);
AuthorizationSetBuilder& Digest(std::initializer_list<Digest> digests);
AuthorizationSetBuilder& Digest(std::vector<Digest> digests);
AuthorizationSetBuilder& Padding(std::initializer_list<PaddingMode> paddings);
template <typename... T>

3
keymaster/4.0/vts/functional/KeymasterHidlTest.cpp
View File

@@ -672,8 +672,7 @@ std::vector<EcCurve> KeymasterHidlTest::InvalidCurves() {
return {EcCurve::P_224, EcCurve::P_384, EcCurve::P_521};
}
std::initializer_list<Digest> KeymasterHidlTest::ValidDigests(bool withNone, bool withMD5) {
std::vector<Digest> result;
std::vector<Digest> KeymasterHidlTest::ValidDigests(bool withNone, bool withMD5) {
switch (SecLevel()) {
case SecurityLevel::TRUSTED_ENVIRONMENT:
if (withNone) {

2
keymaster/4.0/vts/functional/KeymasterHidlTest.h
View File

@@ -214,7 +214,7 @@ class KeymasterHidlTest : public ::testing::VtsHalHidlTargetTestBase {
std::vector<EcCurve> ValidCurves();
std::vector<EcCurve> InvalidCurves();
std::initializer_list<Digest> ValidDigests(bool withNone, bool withMD5);
std::vector<Digest> ValidDigests(bool withNone, bool withMD5);
std::vector<Digest> InvalidDigests();
HidlBuf key_blob_;