From 90e95d740b116a26679a5563c9f52bbf19766228 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Thu, 19 Dec 2019 16:10:44 -0800
Subject: Add Reboot Escrow feature flag

This indicates that the device supports the RebootEscrow HAL for OTA systems
to reboot a device while unattended to apply an update.

Bug: 63928581
Test: make
Change-Id: Ida7f4ee11848a9dfd7deca8501c1fb7d880f6199
---
 data/etc/android.hardware.reboot_escrow.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 data/etc/android.hardware.reboot_escrow.xml

(limited to 'data')

diff --git a/data/etc/android.hardware.reboot_escrow.xml b/data/etc/android.hardware.reboot_escrow.xml
new file mode 100644
index 0000000000..5db9f4c3ce
--- /dev/null
+++ b/data/etc/android.hardware.reboot_escrow.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<!--
+     This is the feature indicating that the device has support for the
+     RebootEscrow HAL.
+-->
+
+<permissions>
+    <feature name="android.hardware.reboot_escrow" />
+</permissions>
-- 
cgit v1.2.3-59-g8ed1b


From 3d36d47b893a66b46c61f91340a3d6a6ea9e83d6 Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Wed, 8 Jan 2020 16:20:26 -0800
Subject: Add feature flag android.hardware.telephony.data

Bug: 146206136
Test: Compiled
Change-Id: I8f6673fe20e0fefc5fb41d0261beea341c8bd223
---
 data/etc/android.hardware.telephony.cdma.xml | 1 +
 data/etc/android.hardware.telephony.gsm.xml  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'data')

diff --git a/data/etc/android.hardware.telephony.cdma.xml b/data/etc/android.hardware.telephony.cdma.xml
index 082378d5ce..b598f6854b 100644
--- a/data/etc/android.hardware.telephony.cdma.xml
+++ b/data/etc/android.hardware.telephony.cdma.xml
@@ -18,4 +18,5 @@
 <permissions>
     <feature name="android.hardware.telephony" />
     <feature name="android.hardware.telephony.cdma" />
+    <feature name="android.hardware.telephony.data" />
 </permissions>
diff --git a/data/etc/android.hardware.telephony.gsm.xml b/data/etc/android.hardware.telephony.gsm.xml
index 7927fa8470..fe8a5cf4d3 100644
--- a/data/etc/android.hardware.telephony.gsm.xml
+++ b/data/etc/android.hardware.telephony.gsm.xml
@@ -18,4 +18,5 @@
 <permissions>
     <feature name="android.hardware.telephony" />
     <feature name="android.hardware.telephony.gsm" />
+    <feature name="android.hardware.telephony.data" />
 </permissions>
-- 
cgit v1.2.3-59-g8ed1b


From 2adea53982c05a3c6b2416fc37893304c0572ec5 Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Mon, 13 Jan 2020 22:12:46 -0800
Subject: Rollback android.hardware.telephony.data

Bug: 146206136
Test: Compiled, Flashed
Change-Id: I37d6a6511331b546fbf4a4aa68f44466fce54ff9
---
 data/etc/android.hardware.telephony.cdma.xml | 1 -
 data/etc/android.hardware.telephony.gsm.xml  | 1 -
 2 files changed, 2 deletions(-)

(limited to 'data')

diff --git a/data/etc/android.hardware.telephony.cdma.xml b/data/etc/android.hardware.telephony.cdma.xml
index b598f6854b..082378d5ce 100644
--- a/data/etc/android.hardware.telephony.cdma.xml
+++ b/data/etc/android.hardware.telephony.cdma.xml
@@ -18,5 +18,4 @@
 <permissions>
     <feature name="android.hardware.telephony" />
     <feature name="android.hardware.telephony.cdma" />
-    <feature name="android.hardware.telephony.data" />
 </permissions>
diff --git a/data/etc/android.hardware.telephony.gsm.xml b/data/etc/android.hardware.telephony.gsm.xml
index fe8a5cf4d3..7927fa8470 100644
--- a/data/etc/android.hardware.telephony.gsm.xml
+++ b/data/etc/android.hardware.telephony.gsm.xml
@@ -18,5 +18,4 @@
 <permissions>
     <feature name="android.hardware.telephony" />
     <feature name="android.hardware.telephony.gsm" />
-    <feature name="android.hardware.telephony.data" />
 </permissions>
-- 
cgit v1.2.3-59-g8ed1b


From 27bc04147e5967af465c394003ee1183f67c5b0e Mon Sep 17 00:00:00 2001
From: Arthur Ishiguro <arthuri@google.com>
Date: Fri, 17 Jan 2020 14:20:41 -0800
Subject: Adds an xml file for Context Hub feature

Bug: 147677675
Test: Compile only
Change-Id: Ifd0cf97e92d04a2e07b1576e8539478f5ab4b92e
---
 data/etc/android.hardware.context_hub.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 data/etc/android.hardware.context_hub.xml

(limited to 'data')

diff --git a/data/etc/android.hardware.context_hub.xml b/data/etc/android.hardware.context_hub.xml
new file mode 100644
index 0000000000..8133e0be05
--- /dev/null
+++ b/data/etc/android.hardware.context_hub.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+
+<!-- Features for devices supporting a Context Hub. -->
+<permissions>
+    <feature name="android.hardware.context_hub" />
+</permissions>
-- 
cgit v1.2.3-59-g8ed1b


From 66a2c81adaf52cd7fb77d07640d67bfb4b438231 Mon Sep 17 00:00:00 2001
From: Alastair Donaldson <afdx@google.com>
Date: Wed, 22 Jan 2020 13:16:20 +0000
Subject: Add configurations for Vulkan dEQP support

Adds files that set the test suite date associated with Vulkan dEQP
support to either 2019-03-01 or 2020-03-01.

Bug: 136573508

Change-Id: I0a70592d243d6833ba13fe3560326ba212caa0bb
---
 ...ndroid.software.vulkan.deqp.level-2019-03-01.xml | 21 +++++++++++++++++++++
 ...ndroid.software.vulkan.deqp.level-2020-03-01.xml | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 data/etc/android.software.vulkan.deqp.level-2019-03-01.xml
 create mode 100644 data/etc/android.software.vulkan.deqp.level-2020-03-01.xml

(limited to 'data')

diff --git a/data/etc/android.software.vulkan.deqp.level-2019-03-01.xml b/data/etc/android.software.vulkan.deqp.level-2019-03-01.xml
new file mode 100644
index 0000000000..9c67d4abb7
--- /dev/null
+++ b/data/etc/android.software.vulkan.deqp.level-2019-03-01.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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.
+-->
+
+<!-- This is the standard feature indicating that the device passes Vulkan deQP
+     tests associated with date 2019-03-01 (0x07E30301). -->
+<permissions>
+    <feature name="android.software.vulkan.deqp.level" version="132317953" />
+</permissions>
diff --git a/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml b/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml
new file mode 100644
index 0000000000..19b269b607
--- /dev/null
+++ b/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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.
+-->
+
+<!-- This is the standard feature indicating that the device passes Vulkan deQP
+     tests associated with date 2020-03-01 (0x07E40301). -->
+<permissions>
+    <feature name="android.software.vulkan.deqp.level" version="132383489" />
+</permissions>
-- 
cgit v1.2.3-59-g8ed1b


From fa3f3d3b091d4170422cb07ef75700102c47a802 Mon Sep 17 00:00:00 2001
From: shubang <shubang@google.com>
Date: Mon, 10 Feb 2020 14:40:38 -0800
Subject: Add android.hardware.tv.tuner feature

see https://developer.android.com/guide/topics/manifest/uses-feature-element

Test: make;
Change-Id: Ib2bc4c0fdd98cb3aaad3be2e3ba53ae7cc933a3a
---
 data/etc/android.hardware.tv.tuner.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 data/etc/android.hardware.tv.tuner.xml

(limited to 'data')

diff --git a/data/etc/android.hardware.tv.tuner.xml b/data/etc/android.hardware.tv.tuner.xml
new file mode 100644
index 0000000000..bbf084fabf
--- /dev/null
+++ b/data/etc/android.hardware.tv.tuner.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+
+<!-- This feature indicates that the device has tuner hardware and tuner HAL
+     implementation to support tuner operations. -->
+<permissions>
+    <feature name="android.hardware.tv.tuner" />
+</permissions>
-- 
cgit v1.2.3-59-g8ed1b


From 8181bb0fd087cb4be77a589aa67702a1fef01103 Mon Sep 17 00:00:00 2001
From: Eran Messeri <eranm@google.com>
Date: Thu, 27 Feb 2020 00:47:48 +0000
Subject: Individual attestation: Feature file

Add a file for the unique attestation feature.

Bug: 140920022
Test: That it compiles.
Change-Id: I6e4577b793d6b28bff855d74b313be7eeeab3f05
Merged-In: I6e4577b793d6b28bff855d74b313be7eeeab3f05
(cherry picked from commit 9606640a396ce74520bb17da909e622485774e5d)
---
 .../android.hardware.device_unique_attestation.xml   | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 data/etc/android.hardware.device_unique_attestation.xml

(limited to 'data')

diff --git a/data/etc/android.hardware.device_unique_attestation.xml b/data/etc/android.hardware.device_unique_attestation.xml
new file mode 100644
index 0000000000..309be7a2c1
--- /dev/null
+++ b/data/etc/android.hardware.device_unique_attestation.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 Keymaster that support unique attestation. -->
+<permissions>
+    <feature name="android.hardware.device_unique_attestation" />
+</permissions>
-- 
cgit v1.2.3-59-g8ed1b


From 16b0d7b6c4fe323b1142b2831815d84effd8ed30 Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Tue, 5 May 2020 15:47:19 -0700
Subject: Add xml file for camera2 concurrent camera feature.

Bug: 155188113

Test: atest CameraManagerTest.java on cuttlefish

Change-Id: I488f6d172a2a27b69dcbe44f79900526c2580f9d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
---
 data/etc/android.hardware.camera.concurrent.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 data/etc/android.hardware.camera.concurrent.xml

(limited to 'data')

diff --git a/data/etc/android.hardware.camera.concurrent.xml b/data/etc/android.hardware.camera.concurrent.xml
new file mode 100644
index 0000000000..2cbb263341
--- /dev/null
+++ b/data/etc/android.hardware.camera.concurrent.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+
+<!-- This is the set of features required for a camera2 device that supports concurrent operation
+     of front and back cameras -->
+<permissions>
+    <feature name="android.hardware.camera.front" />
+    <feature name="android.hardware.camera.concurrent" />
+</permissions>
-- 
cgit v1.2.3-59-g8ed1b


From a9708b1763d7d97693d08a7b534acf120b57f7f8 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 8 May 2020 14:15:08 -0400
Subject: Controls API - Flag controls support

Add a package manager flag so that apps can programmatically query
whether the device have system interface to support the Controls API

Bug: 156096063
Test: manual
Change-Id: I7763d725f930bf6051731bbfbd018f0ff909dfa7
---
 data/etc/android.software.controls.xml | 22 ++++++++++++++++++++++
 data/etc/handheld_core_hardware.xml    |  3 +++
 data/etc/tablet_core_hardware.xml      |  3 +++
 3 files changed, 28 insertions(+)
 create mode 100644 data/etc/android.software.controls.xml

(limited to 'data')

diff --git a/data/etc/android.software.controls.xml b/data/etc/android.software.controls.xml
new file mode 100644
index 0000000000..2cba34b754
--- /dev/null
+++ b/data/etc/android.software.controls.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+
+<!-- This is the standard feature indicating device controls support on the device,
+     as specified in the CDD. ONLY devices that meet the CDD's requirements may
+     declare this feature. -->
+<permissions>
+    <feature name="android.software.controls" />
+</permissions>
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml
index 619d017e69..dc6963fef1 100644
--- a/data/etc/handheld_core_hardware.xml
+++ b/data/etc/handheld_core_hardware.xml
@@ -59,6 +59,9 @@
     <!-- Feature to specify if the device support managed users. -->
     <feature name="android.software.managed_users" notLowRam="true"/>
 
+    <!-- Feature to specify if the device supports controls. -->
+    <feature name="android.software.controls" />
+
     <!-- Devices with all optimizations required to support VR Mode and
          pass all CDD requirements for this feature may include
          android.hardware.vr.high_performance -->
diff --git a/data/etc/tablet_core_hardware.xml b/data/etc/tablet_core_hardware.xml
index 52524ca957..e878f86243 100644
--- a/data/etc/tablet_core_hardware.xml
+++ b/data/etc/tablet_core_hardware.xml
@@ -59,6 +59,9 @@
     <!-- Feature to specify if the device support managed users. -->
     <feature name="android.software.managed_users" />
 
+    <!-- Feature to specify if the device supports controls. -->
+    <feature name="android.software.controls" />
+
     <!-- devices with GPS must include android.hardware.location.gps.xml -->
     <!-- devices with a rear-facing camera must include one of these as appropriate:
          android.hardware.camera.xml or
-- 
cgit v1.2.3-59-g8ed1b


From 02025168dfbbc84b5fcfe8b4d36a397fc9b1e0d3 Mon Sep 17 00:00:00 2001
From: Anthony Stange <stange@google.com>
Date: Sat, 9 May 2020 22:31:06 -0400
Subject: Add XML used to declare hinge sensor support.

Bug: 156049606
Test: Presubmits
Change-Id: I4c453b75fd59987b5bd73d3fb04f535bef0cf765
---
 data/etc/android.hardware.sensor.hinge_angle.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 data/etc/android.hardware.sensor.hinge_angle.xml

(limited to 'data')

diff --git a/data/etc/android.hardware.sensor.hinge_angle.xml b/data/etc/android.hardware.sensor.hinge_angle.xml
new file mode 100644
index 0000000000..d7443058ed
--- /dev/null
+++ b/data/etc/android.hardware.sensor.hinge_angle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 a hinge angle sensor. -->
+<permissions>
+    <feature name="android.hardware.sensor.hinge_angle" />
+</permissions>
\ No newline at end of file
-- 
cgit v1.2.3-59-g8ed1b