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

Commit 83501604 authored by Shawn Willden's avatar Shawn Willden Committed by Automerger Merge Worker
Browse files

Merge "Add flag for app-generated attest keys." am: cc9d967d am: 69bd0bd9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1591655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c66443d86c2a1b24757e9121f6824d722747f70
parents da671049 69bd0bd9
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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.
-->

<!-- Feature for devices that support app attestation keys (i.e. KeyMint 1.0). -->
<permissions>
    <feature name="android.hardware.keystore.app_attest_key" />
</permissions>