Loading security/keymint/aidl/vts/functional/AttestKeyTest.cpp +5 −2 Original line number Original line Diff line number Diff line Loading @@ -142,11 +142,14 @@ class AttestKeyTest : public KeyMintAidlTestBase { return false; return false; } } // Check if chipset has received a waiver allowing it to be launched with // Check if chipset has received a waiver allowing it to be launched with Android S or T with // Android S (or later) with Keymaster 4.0 in StrongBox // Keymaster 4.0 in StrongBox. bool is_chipset_allowed_km4_strongbox(void) const { bool is_chipset_allowed_km4_strongbox(void) const { std::array<char, PROPERTY_VALUE_MAX> buffer; std::array<char, PROPERTY_VALUE_MAX> buffer; const int32_t first_api_level = property_get_int32("ro.board.first_api_level", 0); if (first_api_level <= 0 || first_api_level > __ANDROID_API_T__) return false; auto res = property_get("ro.vendor.qti.soc_model", buffer.data(), nullptr); auto res = property_get("ro.vendor.qti.soc_model", buffer.data(), nullptr); if (res <= 0) return false; if (res <= 0) return false; Loading Loading
security/keymint/aidl/vts/functional/AttestKeyTest.cpp +5 −2 Original line number Original line Diff line number Diff line Loading @@ -142,11 +142,14 @@ class AttestKeyTest : public KeyMintAidlTestBase { return false; return false; } } // Check if chipset has received a waiver allowing it to be launched with // Check if chipset has received a waiver allowing it to be launched with Android S or T with // Android S (or later) with Keymaster 4.0 in StrongBox // Keymaster 4.0 in StrongBox. bool is_chipset_allowed_km4_strongbox(void) const { bool is_chipset_allowed_km4_strongbox(void) const { std::array<char, PROPERTY_VALUE_MAX> buffer; std::array<char, PROPERTY_VALUE_MAX> buffer; const int32_t first_api_level = property_get_int32("ro.board.first_api_level", 0); if (first_api_level <= 0 || first_api_level > __ANDROID_API_T__) return false; auto res = property_get("ro.vendor.qti.soc_model", buffer.data(), nullptr); auto res = property_get("ro.vendor.qti.soc_model", buffer.data(), nullptr); if (res <= 0) return false; if (res <= 0) return false; Loading