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

Commit 3e08bb76 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev 

* commit 'fc7083a8':
  Enable FEATURE_DEVICE_ADMIN for handheld devices
parents b8080d9a fc7083a8

data/etc/handheld_core_hardware.xml

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
    <feature name="android.software.app_widgets" />

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

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

    <!-- Feature to specify if the device supports adding device admins. -->

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

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

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
    <feature name="android.software.app_widgets" />

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

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

    <!-- Feature to specify if the device supports adding device admins. -->

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

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