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

Commit 10e148d7 authored by Justin McClain's avatar Justin McClain Committed by Automerger Merge Worker
Browse files

Merge "Add vendor_required_attestation_certificates to be used by Attestation...

Merge "Add vendor_required_attestation_certificates to be used by Attestation Verification Framework and Partner overlay." am: 9e70a83e am: 75b5c61d

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

Change-Id: Ie8184942cf5b7516a6595abc44e8f13cb6254389
parents e6764928 75b5c61d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@
  <java-symbol type="array" name="vendor_required_apps_managed_user" />
  <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="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" />
+32 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
 * Copyright (C) 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-->
<resources>
  <!-- The PEM-encoded certificates added here are used for verifying attestations.
    The trustworthiness of the attestation depends on the root certificate of the chain.

    Certificates that can be used can be retrieved from:
    https://developer.android.com/training/articles/security-key-attestation#root_certificate.

    If not already present in resource overlay, please add
    vendor_required_attestation_certificates.xml (matching this file) in vendor overlay
    with <item></item> of the PEM-encoded root certificates.
  -->
    <string-array translatable="false" name="vendor_required_attestation_certificates">
    </string-array>
</resources>