keymint: Update version for strongbox feature flag
There's no version info in the default settings.
Add a version field to specify that.
Valid versions are:
- 40 for Keymaster 4.0,
- 41 for Keymaster 4.1, and
- 100 for KeyMint 1.
Bug: 186481293
Bug: 188716468
Bug: 192634248
Change-Id: I59f65b6c185a5da863ca2070cd6d7cb05d5d2164
diff --git a/dauntless/android.hardware.strongbox_keystore.xml b/dauntless/android.hardware.strongbox_keystore.xml
new file mode 100644
index 0000000..949cfcf
--- /dev/null
+++ b/dauntless/android.hardware.strongbox_keystore.xml
@@ -0,0 +1,20 @@
+<?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 StrongBox-backed keystore. -->
+<permissions>
+ <feature name="android.hardware.strongbox_keystore" version="100"/>
+</permissions>
diff --git a/dauntless/dauntless.mk b/dauntless/dauntless.mk
index 75b3f43..d083500 100644
--- a/dauntless/dauntless.mk
+++ b/dauntless/dauntless.mk
@@ -10,7 +10,7 @@
android.hardware.security.keymint-service.citadel
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.strongbox_keystore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.strongbox_keystore.xml
+ hardware/google/pixel/dauntless/android.hardware.strongbox_keystore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.strongbox_keystore.xml
# init scripts (won't be in AOSP)
-include vendor/google_nos/init/dauntless/init.mk