diff options
| author | Jason Monk <jmonk@google.com> | 2014-08-13 16:29:08 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-08-14 11:37:58 -0400 |
| commit | 48aacba761527a529c2b668c8151c7f98ff70524 (patch) | |
| tree | f005c849cb57791dfe72c2655633569bdc52ff72 /api | |
| parent | d4c25dbe67ca1c46105d09905be7bd6fdcecf35b (diff) | |
| download | frameworks_base-48aacba761527a529c2b668c8151c7f98ff70524.zip frameworks_base-48aacba761527a529c2b668c8151c7f98ff70524.tar.gz frameworks_base-48aacba761527a529c2b668c8151c7f98ff70524.tar.bz2 | |
Fixes to lock task API from API review
Adding ComponentNames and some splitting/renaming of broadcasts.
Bug: 17005622
Change-Id: I9ece3553310fb20b0c3c3e4032b408e86384363a
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index eb991ad..4434483 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5367,7 +5367,8 @@ 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, boolean, java.lang.String); + method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, java.lang.String); + method public void onLockTaskModeExiting(android.content.Context, android.content.Intent); 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); @@ -5377,7 +5378,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_CHANGED = "android.app.action.ACTION_LOCK_TASK_CHANGED"; + 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_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"; @@ -5385,7 +5387,6 @@ package android.app.admin { field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE"; 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"; } @@ -5454,7 +5455,7 @@ package android.app.admin { method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); - method public void setLockTaskPackages(java.lang.String[]) throws java.lang.SecurityException; + method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException; method public void setMasterVolumeMuted(android.content.ComponentName, boolean); method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int); method public void setMaximumTimeToLock(android.content.ComponentName, long); |