commit 0b52f7a4063a806949088fc0ca71aa67c407ddf7
author Bartosz Fabianowski <bartfab@google.com> Tue Apr 25 10:50:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 10:50:27 2017 +0000
tree 7b4bb8a443e695b43e0bcaebda604d05011b0bec
parent 88e89ef467b68c2281d54b8b723fe824039c18a9
parent d7b16e14c27b97a0bbeb0ba6825d0e5987daf5b7

Merge "Finish adding manufacturer and model to device ID attestation" into oc-dev am: 8fcab148c2
am: d7b16e14c2

Change-Id: I49df5ef418cf43e60de024fb087da03b8f9feaf0

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 58102bb..9c7c860 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -528,6 +528,8 @@
         case Tag::ATTESTATION_ID_SERIAL:
         case Tag::ATTESTATION_ID_IMEI:
         case Tag::ATTESTATION_ID_MEID:
+        case Tag::ATTESTATION_ID_MANUFACTURER:
+        case Tag::ATTESTATION_ID_MODEL:
             // Device id attestation may only be supported if the device is able to permanently
             // destroy its knowledge of the ids. This device is unable to do this, so it must
             // never perform any device id attestation.