Merge "Add vendor_required_attestation_revocation_list_url property to be used by Attestation Verification Framework and partner overlay." am: 3796cd4634 am: 7bfa249153

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997712

Change-Id: I42ae9a6c68f7f66166d6e05f490b56faa5435de9
This commit is contained in:
Justin McClain
2022-02-25 14:36:17 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 0 deletions

View File

@@ -1279,6 +1279,7 @@
<java-symbol type="array" name="vendor_required_apps_managed_profile" /> <java-symbol type="array" name="vendor_required_apps_managed_profile" />
<java-symbol type="array" name="vendor_required_apps_managed_device" /> <java-symbol type="array" name="vendor_required_apps_managed_device" />
<java-symbol type="array" name="vendor_required_attestation_certificates" /> <java-symbol type="array" name="vendor_required_attestation_certificates" />
<java-symbol type="string" name="vendor_required_attestation_revocation_list_url" />
<java-symbol type="array" name="vendor_disallowed_apps_managed_user" /> <java-symbol type="array" name="vendor_disallowed_apps_managed_user" />
<java-symbol type="array" name="vendor_disallowed_apps_managed_profile" /> <java-symbol type="array" name="vendor_disallowed_apps_managed_profile" />
<java-symbol type="array" name="vendor_disallowed_apps_managed_device" /> <java-symbol type="array" name="vendor_disallowed_apps_managed_device" />

View File

@@ -29,4 +29,10 @@
--> -->
<string-array translatable="false" name="vendor_required_attestation_certificates"> <string-array translatable="false" name="vendor_required_attestation_certificates">
</string-array> </string-array>
<!-- Url to mapping of revoked certificates' hex encoded serial numbers. Example format
can be found at:
https://developer.android.com/training/articles/security-key-attestation#certificate_status
-->
<string translatable="false" name="vendor_required_attestation_revocation_list_url"></string>
</resources> </resources>