diff options
| author | Ying Wang <wangying@google.com> | 2015-02-25 12:55:52 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-02-25 12:55:52 -0800 |
| commit | c76e9c62c9701984d75d54caaf51a418a91eaf6a (patch) | |
| tree | 7e64655bec3e4a7d8a45d9ea36b9bce8ba7ff1dc /system-api | |
| parent | 4a6c0c24bc5ae2b9fd4bda886adf9817ffecc070 (diff) | |
| download | prebuilts_sdk-c76e9c62c9701984d75d54caaf51a418a91eaf6a.zip prebuilts_sdk-c76e9c62c9701984d75d54caaf51a418a91eaf6a.tar.gz prebuilts_sdk-c76e9c62c9701984d75d54caaf51a418a91eaf6a.tar.bz2 | |
Port commit 6961862cb6 to api files of level 23.
Change-Id: I41c5a3221a672a529915e2248c780d8b0ad5d1a4
Diffstat (limited to 'system-api')
| -rw-r--r-- | system-api/23.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/system-api/23.txt b/system-api/23.txt index c215c88..b215351 100644 --- a/system-api/23.txt +++ b/system-api/23.txt @@ -5468,7 +5468,6 @@ package android.app.admin { method public boolean getScreenCaptureDisabled(android.content.ComponentName); method public boolean getStorageEncryption(android.content.ComponentName); method public int getStorageEncryptionStatus(); - method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName); method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]); method public boolean hasGrantedPolicy(android.content.ComponentName, int); method public boolean installCaCert(android.content.ComponentName, byte[]); @@ -5518,7 +5517,6 @@ package android.app.admin { 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 void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle); method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); method public void uninstallAllUserCaCerts(android.content.ComponentName); |