From 5503a55c0b34f54076c319e03ef6a7b792e7950e Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Thu, 4 Sep 2014 14:14:37 -0400 Subject: [PATCH] Change constants from API review feedback Bug: 17390600 Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91 --- api/current.txt | 4 ++-- core/java/android/app/admin/DeviceAdminReceiver.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index a69a8e5f98a05..aabafb7d9eb67 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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_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_LOCK_TASK_ENTERING = "android.app.action.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_ENTERING = "android.app.action.LOCK_TASK_ENTERING"; + 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_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING"; field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED"; diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 15def097d5e71..e2f175c10bf99 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -177,7 +177,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) 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 @@ -190,7 +190,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) 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