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

Commit 09e9384b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Added android.software.device_admin feature."" into sc-dev am: 330f09cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14826659

Change-Id: I9f8753802ba540c7ff1b375d84d4dc56562e6384
parents d7ba0ce7 330f09cd
Loading
Loading
Loading
Loading
+0 −6
Original line number Original line Diff line number Diff line
@@ -47,12 +47,6 @@
    <feature name="android.software.secure_lock_screen" />
    <feature name="android.software.secure_lock_screen" />
    <feature name="android.software.input_methods" />
    <feature name="android.software.input_methods" />



    <!-- Feature to support device admins -->
    <!-- TODO(b/178412797): not fully supported yet, CTS tests are still
         failing. -->
    <feature name="android.software.device_admin" />

    <!-- devices with GPS must include android.hardware.location.gps.xml -->
    <!-- devices with GPS must include android.hardware.location.gps.xml -->
    <!-- devices with an autofocus camera and/or flash must include either
    <!-- devices with an autofocus camera and/or flash must include either
         android.hardware.camera.autofocus.xml or
         android.hardware.camera.autofocus.xml or