diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-05-20 22:10:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 22:10:46 +0000 |
| commit | 4d40452154a3a9cf04abaa8451792c85ade2ad6f (patch) | |
| tree | 1e67eb69fee1eb0fafbdff88523bb6ff515d0ab8 /api | |
| parent | 0c62e8eb30ce6631621a772a75058481adeb3bb5 (diff) | |
| parent | da551653219092306fc7e1ce5743ab40683cee6f (diff) | |
| download | frameworks_base-4d40452154a3a9cf04abaa8451792c85ade2ad6f.zip frameworks_base-4d40452154a3a9cf04abaa8451792c85ade2ad6f.tar.gz frameworks_base-4d40452154a3a9cf04abaa8451792c85ade2ad6f.tar.bz2 | |
Merge "Allow device/profile owners to update settings."
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 a620727..3a713cc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5105,6 +5105,7 @@ package android.app.admin { 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 setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); 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); @@ -5120,6 +5121,7 @@ package android.app.admin { method public void setPasswordMinimumUpperCase(android.content.ComponentName, int); method public void setPasswordQuality(android.content.ComponentName, int); method public void setProfileEnabled(android.content.ComponentName); + method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public int setStorageEncryption(android.content.ComponentName, boolean); method public void wipeData(int); field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN"; |