Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bfa2491 authored by Justin McClain's avatar Justin McClain Committed by Automerger Merge Worker
Browse files

Merge "Add vendor_required_attestation_revocation_list_url property to be used... 

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

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

Change-Id: I7f2869dbda3ac900b8e7eac3930a8fc0ffb9a080
parents a80c2cd0 3796cd46

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,7 @@ 
  <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_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_profile" />

  <java-symbol type="array" name="vendor_disallowed_apps_managed_device" />

core/res/res/values/vendor_required_attestation_certificates.xml

+6 −0
Original line number Diff line number Diff line
@@ -29,4 +29,10 @@ 
  -->

    <string-array translatable="false" name="vendor_required_attestation_certificates">

    </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>