commit d7b16e14c27b97a0bbeb0ba6825d0e5987daf5b7
author Bartosz Fabianowski <bartfab@google.com> Tue Apr 25 10:47:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 10:47:57 2017 +0000
tree bf0145f58ee3a7287bd25e092d84e1e2d799a949
parent d350340340f50b491c2de8588fbe52df45794f45
parent 8fcab148c2b188dc995bfcf67b6e48f6b6a0cc92

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

Change-Id: Ib568ef34a26d500e452887118338679388dfcf8e

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.