commit e7d8db4b417881712c5edb408d59bafe08457dcc
author Eran Messeri <eranm@google.com> Fri Aug 10 15:39:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 15:39:10 2018 -0700
tree 4ab28b8be2cadf94b183d0002255dccb8deb42d2
parent 199a5a690ee9cab89677c669495d14ed2dde8836
parent 5239def81b6de3acc00da690d8ace2965df2cf18

Merge "Merge "AOSP builds do not support Device ID attestation" into pie-vts-dev am: 78c0e32983"
am: 5239def81b

Change-Id: I1cce3f0e8992326ac4cda516f1b5740155ef626e

data/etc/aosp_excluded_hardware.xml

diff --git a/data/etc/aosp_excluded_hardware.xml b/data/etc/aosp_excluded_hardware.xml
index 013f278..c12f435 100644
--- a/data/etc/aosp_excluded_hardware.xml
+++ b/data/etc/aosp_excluded_hardware.xml
@@ -18,4 +18,5 @@
     <!-- This should be used to exclude this feature from aosp targets. As aosp configurations
     may or may not have a valid location provider -->
     <unavailable-feature name="android.hardware.location.network" />
+    <unavailable-feature name="android.software.device_id_attestation" />
 </permissions>