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

Commit d12a9d27 authored by Adam Connors's avatar Adam Connors Committed by Android (Google) Code Review
Browse files

Merge "Add android.software.managedprofiles feature flag."

parents 786e26a8 acc235a5

data/etc/android.software.managedprofiles.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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 supports managed profiles. -->

<permissions>

    <feature name="android.software.managedprofiles" />

</permissions>

data/etc/handheld_core_hardware.xml

+6 −3
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 
    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />



    <!-- Feature to specify if the device support managed profiles. -->

    <feature name="android.software.managedprofiles" />



    <!-- devices with GPS must include android.hardware.location.gps.xml -->

    <!-- devices with an autofocus camera and/or flash must include either

         android.hardware.camera.autofocus.xml or

data/etc/tablet_core_hardware.xml

+7 −4
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ 
    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />



    <!-- Feature to specify if the device support managed profiles. -->

    <feature name="android.software.managedprofiles" />



    <!-- 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