diff options
| author | Jim Miller <jaggies@google.com> | 2015-02-24 18:32:20 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-02-25 11:43:49 -0800 |
| commit | d9486e69fabf30b2fe1079bdacebf89071114c2d (patch) | |
| tree | 94349420a30b86397ab97a4e08bf4dd115cf4017 | |
| parent | fc5f3bd8c918850b985c5e7e7d939b12a54c61b8 (diff) | |
| download | sdk-d9486e69fabf30b2fe1079bdacebf89071114c2d.tar.gz | |
Remove TrustAgent whitelisting APIandroid-5.1.0_r3
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.
Bug 19461292
Change-Id: Ibd3c100d363f7eecee9265ce387cc3e61eba1333
| -rw-r--r-- | api/22.txt | 2 | ||||
| -rw-r--r-- | system-api/22.txt | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/api/22.txt b/api/22.txt index 144f2923b..35423fdcb 100644 --- a/api/22.txt +++ b/api/22.txt @@ -5336,7 +5336,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[]); @@ -5385,7 +5384,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); diff --git a/system-api/22.txt b/system-api/22.txt index e1a00e05a..1f4b187f4 100644 --- a/system-api/22.txt +++ b/system-api/22.txt @@ -5469,7 +5469,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[]); @@ -5519,7 +5518,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); |