diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-07-23 16:59:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-23 05:48:23 +0000 |
| commit | 0c1dcfd1618b1042c74100965f0e79c1c954c5c4 (patch) | |
| tree | 537b8b9ed85451f31b7dcaba18c363d09b28d0d3 /api | |
| parent | a55ccc02f5d3bd7ef3184441333000c44d99758b (diff) | |
| parent | d2a1eec400128f39e1b223a720a88dbd395f3e6e (diff) | |
| download | frameworks_base-0c1dcfd1618b1042c74100965f0e79c1c954c5c4.zip frameworks_base-0c1dcfd1618b1042c74100965f0e79c1c954c5c4.tar.gz frameworks_base-0c1dcfd1618b1042c74100965f0e79c1c954c5c4.tar.bz2 | |
Merge "Add Device Policy API to disable screen capture." into lmp-dev
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 025c778..75664a5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5355,6 +5355,7 @@ package android.app.admin { method public int getPasswordMinimumSymbols(android.content.ComponentName); method public int getPasswordMinimumUpperCase(android.content.ComponentName); method public int getPasswordQuality(android.content.ComponentName); + method public boolean getScreenCaptureDisabled(android.content.ComponentName); method public boolean getStorageEncryption(android.content.ComponentName); method public int getStorageEncryptionStatus(); method public boolean hasAnyCaCertsInstalled(); @@ -5399,6 +5400,7 @@ package android.app.admin { method public void setProfileName(android.content.ComponentName, java.lang.String); method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo); method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName); + method public void setScreenCaptureDisabled(android.content.ComponentName, boolean); method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public int setStorageEncryption(android.content.ComponentName, boolean); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); |