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

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

Merge "Controls API - Flag controls support" into rvc-dev am: 17884fa8 am:...

Merge "Controls API - Flag controls support" into rvc-dev am: 17884fa8 am: 8df4aa57 am: ae614722 am: b1316904

Change-Id: I56630b331eee7a235b33f21198deba1b978bb27f
parents 1af671f8 b1316904
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<?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>
+3 −0
Original line number Diff line number Diff line
@@ -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 -->
+3 −0
Original line number Diff line number Diff line
@@ -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