commit 89a687005ee4fb71604146f7de2a3cfca0053aeb
author Shawn Willden <swillden@google.com> Thu Sep 12 12:07:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 12 12:07:16 2019 -0700
tree 20de48a0d72ea17509c1ea916627eae468f7e580
parent 368b4098bf97aa28ac8a28b6c1c66dad12617e05
parent a63f99d0062c16dedad37bd4b6cb4600cd9f68bc

Merge "Don't fail attestation on missing app ID" am: 5386377bfb am: 8bac7ba894
am: a63f99d006

Change-Id: I512e4ddac234c7d2b229b30794443cf2280199ef

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index ba8a3f3..86c0913 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -118,7 +118,8 @@
     auto asn1_attestation_id_result = security::gather_attestation_application_id(callingUid);
     if (!asn1_attestation_id_result.isOk()) {
         ALOGE("failed to gather attestation_id");
-        return ErrorCode::ATTESTATION_APPLICATION_ID_MISSING;
+        // Couldn't get attestation ID; just use an empty one rather than failing.
+        asn1_attestation_id_result = std::vector<uint8_t>();
     }
     std::vector<uint8_t>& asn1_attestation_id = asn1_attestation_id_result;