commit 06c59fc0c9575ab03bf7638e05559eaf728c2442
author nagendra modadugu <ngm@google.com> Wed Oct 10 18:09:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 10 18:09:52 2018 -0700
tree 82d934e1fc930c31f9a1f36c89ca2d490de85a6b
parent 972d8db073f5127ac6218b113968ce086f85522d
parent 595335c577f619ff89b8cc6aea087e71bd80675f

[automerger skipped] keystore: abort if verification token generation fails am: 36a9f4ff40 am: c0b14a8113  -s ours
am: 595335c577  -s ours

Change-Id: I9157a9be6330a9993e4e8deab130c1991b08d636

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 95eaa4c..2aaa625 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1599,7 +1599,7 @@
 }
 
 int isDeviceIdAttestationRequested(const KeymasterArguments& params) {
-    const hardware::hidl_vec<KeyParameter> paramsVec = params.getParameters();
+    const hardware::hidl_vec<KeyParameter>& paramsVec = params.getParameters();
     int result = 0;
     for (size_t i = 0; i < paramsVec.size(); ++i) {
         switch (paramsVec[i].tag) {