diff options
| author | Adrian Roos <roosa@google.com> | 2015-03-05 19:25:48 +0000 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-03-05 19:26:07 +0000 |
| commit | b37f5182052e7a3ab9e249a434367077c8d82400 (patch) | |
| tree | 6d418f78ba2fee9dd0ff240ebc031f0f71ef787f /api | |
| parent | 47d740b92b631b1f69b63702f5edfc83538345cf (diff) | |
| download | frameworks_base-b37f5182052e7a3ab9e249a434367077c8d82400.zip frameworks_base-b37f5182052e7a3ab9e249a434367077c8d82400.tar.gz frameworks_base-b37f5182052e7a3ab9e249a434367077c8d82400.tar.bz2 | |
Revert "Remove TrustAgent whitelisting API"
This reverts commit bc4f2ccf6cfd1a512ad907eda2713ea3c4a1755e
and re-enables the API for MNC.
Bug: 19461292
Change-Id: I53b94bacb6a879fcc0598edfc0f3d44a9dd9e84c
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 7a348ea..bc6ff51 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5495,6 +5495,7 @@ 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[]); @@ -5545,6 +5546,7 @@ 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 setUserEnabled(android.content.ComponentName); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); diff --git a/api/system-current.txt b/api/system-current.txt index 4755fe7..8bc36b41 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5596,6 +5596,7 @@ 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[]); @@ -5647,6 +5648,7 @@ 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 setUserEnabled(android.content.ComponentName); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); |