diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-05-08 12:52:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 12:52:50 +0000 |
| commit | 12fa1fe3077368241cc80cf9a9f33e035521781b (patch) | |
| tree | ab996e1f42a5ecbe9a34bbcdabfe72bf308b5861 /api | |
| parent | 219ccc3b35e83a66d9087ad7f394b7944515936c (diff) | |
| parent | 5c082dd22fc685f5d59167c0485748c72ef30ec7 (diff) | |
| download | frameworks_base-12fa1fe3077368241cc80cf9a9f33e035521781b.zip frameworks_base-12fa1fe3077368241cc80cf9a9f33e035521781b.tar.gz frameworks_base-12fa1fe3077368241cc80cf9a9f33e035521781b.tar.bz2 | |
am 7d5cd652: Merge "Add API to disable account management for certain types of accounts."
* commit '7d5cd65262c9a5735f660e05ce89a02f2d28be14':
Add API to disable account management for certain types of accounts.
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 4e3ee3c..0e87ee9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5030,6 +5030,7 @@ package android.app.admin { method public void clearUserRestriction(android.content.ComponentName, java.lang.String); method public void enableSystemApp(android.content.ComponentName, java.lang.String); method public int enableSystemApp(android.content.ComponentName, android.content.Intent); + method public java.lang.String[] getAccountTypesWithManagementDisabled(); method public java.util.List<android.content.ComponentName> getActiveAdmins(); method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String); method public boolean getCameraDisabled(android.content.ComponentName); @@ -5059,6 +5060,7 @@ package android.app.admin { method public void lockNow(); method public void removeActiveAdmin(android.content.ComponentName); method public boolean resetPassword(java.lang.String, int); + method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean); 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); |