diff options
| author | 2014-06-18 20:03:13 +0000 | |
|---|---|---|
| committer | 2014-06-17 21:13:21 +0000 | |
| commit | c37bf2a87efdfd34a4dc2e7de5a8f4aeaed81d05 (patch) | |
| tree | 40d3d12b566e3923cfa7b495b19d0a63ef8dd5ec | |
| parent | b9db146d0da2d10c0f2ade631d01d11a9fb9882d (diff) | |
| parent | 72c16de7e30353636e1efac4304d7f1ce23ec69e (diff) | |
Merge "Fix missed running update-api"
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 8f90ca317535..931ab3b94376 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5194,7 +5194,7 @@ package android.app.admin { method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent); method public void onDisabled(android.content.Context, android.content.Intent); method public void onEnabled(android.content.Context, android.content.Intent); - method public void onLockTaskModeChanged(android.content.Context, android.content.Intent); + method public void onLockTaskModeChanged(android.content.Context, android.content.Intent, boolean, java.lang.String); method public void onPasswordChanged(android.content.Context, android.content.Intent); method public void onPasswordExpiring(android.content.Context, android.content.Intent); method public void onPasswordFailed(android.content.Context, android.content.Intent); @@ -5213,6 +5213,7 @@ package android.app.admin { field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin"; field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING"; field public static final java.lang.String EXTRA_LOCK_TASK_ENTERING = "android.app.extra.LOCK_TASK_ENTERING"; + field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; } public class DevicePolicyManager { |