diff options
| author | Jim Miller <jaggies@google.com> | 2012-09-04 15:20:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 15:20:42 -0700 |
| commit | 175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3 (patch) | |
| tree | 5892f9df667e5fed3fc3f18be7fb075869883632 /api | |
| parent | 690420831c9b60f7fb2f1100aeef67ad79bfd3bb (diff) | |
| parent | b8ec470617590fa2025db869e8e80dcce8eaec23 (diff) | |
| download | frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.zip frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.tar.gz frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.tar.bz2 | |
Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index aaf5448..f1777db 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4179,6 +4179,7 @@ package android.app.admin { field public static final android.os.Parcelable.Creator CREATOR; field public static final int USES_ENCRYPTED_STORAGE = 7; // 0x7 field public static final int USES_POLICY_DISABLE_CAMERA = 8; // 0x8 + field public static final int USES_POLICY_DISABLE_KEYGUARD_WIDGETS = 9; // 0x9 field public static final int USES_POLICY_EXPIRE_PASSWORD = 6; // 0x6 field public static final int USES_POLICY_FORCE_LOCK = 3; // 0x3 field public static final int USES_POLICY_LIMIT_PASSWORD = 0; // 0x0 @@ -4214,6 +4215,7 @@ package android.app.admin { method public java.util.List<android.content.ComponentName> getActiveAdmins(); method public boolean getCameraDisabled(android.content.ComponentName); method public int getCurrentFailedPasswordAttempts(); + method public int getKeyguardWidgetsDisabled(android.content.ComponentName); method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName); method public long getMaximumTimeToLock(android.content.ComponentName); method public long getPasswordExpiration(android.content.ComponentName); @@ -4237,6 +4239,7 @@ package android.app.admin { method public void removeActiveAdmin(android.content.ComponentName); method public boolean resetPassword(java.lang.String, int); method public void setCameraDisabled(android.content.ComponentName, boolean); + method public void setKeyguardWidgetsDisabled(android.content.ComponentName, int); method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int); method public void setMaximumTimeToLock(android.content.ComponentName, long); method public void setPasswordExpirationTimeout(android.content.ComponentName, long); @@ -4260,6 +4263,8 @@ package android.app.admin { field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0 field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION"; field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN"; + field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 2147483647; // 0x7fffffff + field public static final int KEYGUARD_DISABLE_WIDGETS_NONE = 0; // 0x0 field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000 field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000 field public static final int PASSWORD_QUALITY_BIOMETRIC_WEAK = 32768; // 0x8000 |