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

Commit d8927a84 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Change constants from API review feedback" into lmp-dev

parents 81a0cbcd 5503a55c

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -5391,8 +5391,8 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_ENABLED = "android.app.action.DEVICE_ADMIN_ENABLED";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_ENABLED = "android.app.action.DEVICE_ADMIN_ENABLED";

    field public static final java.lang.String ACTION_LOCK_TASK_ENTERING = "android.app.action.ACTION_LOCK_TASK_ENTERING";

    field public static final java.lang.String ACTION_LOCK_TASK_ENTERING = "android.app.action.LOCK_TASK_ENTERING";

    field public static final java.lang.String ACTION_LOCK_TASK_EXITING = "android.app.action.ACTION_LOCK_TASK_EXITING";

    field public static final java.lang.String ACTION_LOCK_TASK_EXITING = "android.app.action.LOCK_TASK_EXITING";

    field public static final java.lang.String ACTION_PASSWORD_CHANGED = "android.app.action.ACTION_PASSWORD_CHANGED";

    field public static final java.lang.String ACTION_PASSWORD_CHANGED = "android.app.action.ACTION_PASSWORD_CHANGED";

    field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING";

    field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING";

    field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";

    field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";

core/java/android/app/admin/DeviceAdminReceiver.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
     */

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_LOCK_TASK_ENTERING

    public static final String ACTION_LOCK_TASK_ENTERING

            = "android.app.action.ACTION_LOCK_TASK_ENTERING";

            = "android.app.action.LOCK_TASK_ENTERING";





    /**

    /**

     * Action sent to a device administrator to notify that the device is exiting

     * Action sent to a device administrator to notify that the device is exiting
@@ -190,7 +190,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
     */

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_LOCK_TASK_EXITING

    public static final String ACTION_LOCK_TASK_EXITING

            = "android.app.action.ACTION_LOCK_TASK_EXITING";

            = "android.app.action.LOCK_TASK_EXITING";





    /**

    /**

     * A boolean describing whether the device is currently entering or exiting

     * A boolean describing whether the device is currently entering or exiting