diff options
| author | justinzhang <justinzhang@google.com> | 2014-05-08 20:38:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 20:38:45 +0000 |
| commit | a0111698d4920b964eb61f03e3d764c2eb6f6245 (patch) | |
| tree | 2b12c852727f9c507af51c54a11cde9bdd83b893 /api | |
| parent | 80f64f2555f176a62e04ed00a0341168d9109611 (diff) | |
| parent | ed32c842c6d0cc31587256bfbfc2693588ee556c (diff) | |
| download | frameworks_base-a0111698d4920b964eb61f03e3d764c2eb6f6245.zip frameworks_base-a0111698d4920b964eb61f03e3d764c2eb6f6245.tar.gz frameworks_base-a0111698d4920b964eb61f03e3d764c2eb6f6245.tar.bz2 | |
am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task"
* commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc':
DevicePolicyManager Authentication for Lock Task
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 069f67d..d27b3e7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5050,6 +5050,7 @@ package android.app.admin { method public boolean isActivePasswordSufficient(); method public boolean isAdminActive(android.content.ComponentName); method public boolean isDeviceOwnerApp(java.lang.String); + method public boolean isLockTaskPermitted(android.content.ComponentName); method public boolean isProfileOwnerApp(java.lang.String); method public void lockNow(); method public void removeActiveAdmin(android.content.ComponentName); @@ -5058,6 +5059,7 @@ package android.app.admin { method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle); method public void setCameraDisabled(android.content.ComponentName, boolean); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); + method public void setLockTaskComponents(android.content.ComponentName[]) throws java.lang.SecurityException; method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int); method public void setMaximumTimeToLock(android.content.ComponentName, long); method public void setPasswordExpirationTimeout(android.content.ComponentName, long); |