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

Commit 000ecdd3 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 6484c42e: am 33caca5c: Merge "Add a feature to specify if device admins are... 

am 6484c42e: am 33caca5c: Merge "Add a feature to specify if device admins are supported on the device" into klp-dev

* commit '6484c42e':
  Add a feature to specify if device admins are supported on the device
parents 2c0d90a6 6484c42e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7293,6 +7293,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";

    field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";

    field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";

    field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

    field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

core/java/android/content/pm/PackageManager.java

+7 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,13 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_INPUT_METHODS = "android.software.input_methods";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports device policy enforcement via device admins.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_DEVICE_ADMIN = "android.software.device_admin";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports WiFi (802.11) networking.

services/java/com/android/server/DevicePolicyManagerService.java

+179 −7

File changed.

Preview size limit exceeded, changes collapsed.