commit d8544338989c53f52f45d05e1d9e46df34e29b03
author The Android Automerger <android-build@google.com> Thu Oct 08 09:20:35 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Oct 08 09:20:35 2015 -0700
tree 430089cdf7fc7c26a6610e53e6b553d9e88505e3
parent 35619fd4b2c22d6584efb3de9d410f4a22c36306
parent c3e82c790a376221c87d139cbeca688775c6b86e

merge in mnc-dr-release history after reset to mnc-dr-dev

android_keymaster_test.cpp

diff --git a/android_keymaster_test.cpp b/android_keymaster_test.cpp
index f0ae2f1..a340206 100644
--- a/android_keymaster_test.cpp
+++ b/android_keymaster_test.cpp
@@ -302,7 +302,7 @@
     ASSERT_EQ(KM_ERROR_OK, device()->get_supported_digests(device(), KM_ALGORITHM_HMAC,
                                                            KM_PURPOSE_SIGN, &digests, &len));
     if (GetParam()->minimal_digest_set()) {
-        EXPECT_TRUE(ResponseContains({KM_DIGEST_SHA_2_256}, digests, len));
+        EXPECT_TRUE(ResponseContains(KM_DIGEST_SHA_2_256, digests, len));
     } else {
         EXPECT_TRUE(ResponseContains({KM_DIGEST_SHA_2_224, KM_DIGEST_SHA_2_256, KM_DIGEST_SHA_2_384,
                                       KM_DIGEST_SHA_2_512, KM_DIGEST_SHA1},