Revert "Filter USER_ID tag from the hardware keystore"
This reverts commit d98dcfb331c8e81a4aff2d61252f8bb1965e4920.
Reason for revert: Found a better fix on the Java side.
Change-Id: If4244df5c292eb79baf612fd52f75fbfd20c6f6c
diff --git a/keymaster/4.0/support/Keymaster3.cpp b/keymaster/4.0/support/Keymaster3.cpp
index 84b3ee1..b2cdbd9 100644
--- a/keymaster/4.0/support/Keymaster3.cpp
+++ b/keymaster/4.0/support/Keymaster3.cpp
@@ -61,12 +61,9 @@
}
hidl_vec<V3_0::KeyParameter> convert(const hidl_vec<KeyParameter>& params) {
- std::vector<V3_0::KeyParameter> converted;
- converted.reserve(params.size());
- for (const auto& param : params) {
- // Qualcomm's Keymaster3 implementation behaves oddly if Tag::USER_ID is provided. Filter it
- // out. Revert this change when b/73286437 is fixed.
- if (param.tag != Tag::USER_ID) converted.push_back(convert(param));
+ hidl_vec<V3_0::KeyParameter> converted(params.size());
+ for (size_t i = 0; i < params.size(); ++i) {
+ converted[i] = convert(params[i]);
}
return converted;
}