commit 4cf3bf237a19d9f0351abb97543935c930c6cef3
author Rob Barnes <robbarnes@google.com> Thu Dec 20 23:33:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 20 23:33:25 2018 +0000
tree 0d9c151acac1833360f85e78f9e37b24971ea79c
parent 6df27abdd0a932e21743054e0c7f1a2c70306bc7
parent 5d59e6351c54f2f0c7a203db323b3e59eecb2a41

Merge "Changed uid output parameter from an int array to a list of strings."

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 366f591..c1d81b3 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -13,7 +13,6 @@
     },
 
     clang: true,
-    cpp_std: "c++17",
 }
 
 cc_binary {

keystore/keymaster_worker.cpp

diff --git a/keystore/keymaster_worker.cpp b/keystore/keymaster_worker.cpp
index c7d2671..fd07e86 100644
--- a/keystore/keymaster_worker.cpp
+++ b/keystore/keymaster_worker.cpp
@@ -346,7 +346,7 @@
         {
             hidl_vec<uint8_t> clientId;
             hidl_vec<uint8_t> appData;
-            for (auto param : opParams) {
+            for (const auto& param : opParams) {
                 if (param.tag == Tag::APPLICATION_ID) {
                     clientId = authorizationValue(TAG_APPLICATION_ID, param).value();
                 } else if (param.tag == Tag::APPLICATION_DATA) {