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

Commit e2b13e49 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Limited use key: feature files" into sc-dev am: 74e21077

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19dc3e1aadab949d640673f40c35f9eb577e50b0
parents 7e382bc2 74e21077
Loading
Loading
Loading
Loading
+21 −0
Original line number Original line 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 with KeyMint that can enforce limited use key
     in hardware with any max usage count (including count equals to 1). -->
<permissions>
    <feature name="android.hardware.keystore.limited_use_key" />
</permissions>
 No newline at end of file
+21 −0
Original line number Original line 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 with KeyMint that only can enforce limited use key
     in hardware with max usage count equals to 1. -->
<permissions>
    <feature name="android.hardware.keystore.single_use_key" />
</permissions>
 No newline at end of file