Merge "Add android.software.managedprofiles feature flag."
This commit is contained in:
commit
d12a9d27b3
20
data/etc/android.software.managedprofiles.xml
Normal file
20
data/etc/android.software.managedprofiles.xml
Normal file
@ -0,0 +1,20 @@
|
||||
<?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>
|
@ -4,9 +4,9 @@
|
||||
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.
|
||||
@ -44,9 +44,12 @@
|
||||
<!-- 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
|
||||
android.hardware.camera.autofocus.xml or
|
||||
android.hardware.camera.autofocus-flash.xml -->
|
||||
<!-- devices with a front facing camera must include
|
||||
android.hardware.camera.front.xml -->
|
||||
|
@ -4,9 +4,9 @@
|
||||
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.
|
||||
@ -45,10 +45,13 @@
|
||||
<!-- 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
|
||||
android.hardware.camera.autofocus.xml or
|
||||
android.hardware.camera.xml or
|
||||
android.hardware.camera.autofocus.xml or
|
||||
android.hardware.camera.autofocus-flash.xml -->
|
||||
<!-- devices with a front facing camera must include
|
||||
android.hardware.camera.front.xml -->
|
||||
|
Loading…
Reference in New Issue
Block a user