drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jim Miller
2015-02-25 18:04:57 +00:00
committed by Android (Google) Code Review
parent 8ffb574a50 bc4f2ccf6c
commit b46e48067f
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -5336,7 +5336,6 @@ package android.app.admin {
method public boolean getScreenCaptureDisabled(android.content.ComponentName); method public boolean getScreenCaptureDisabled(android.content.ComponentName);
method public boolean getStorageEncryption(android.content.ComponentName); method public boolean getStorageEncryption(android.content.ComponentName);
method public int getStorageEncryptionStatus(); 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 hasCaCertInstalled(android.content.ComponentName, byte[]);
method public boolean hasGrantedPolicy(android.content.ComponentName, int); method public boolean hasGrantedPolicy(android.content.ComponentName, int);
method public boolean installCaCert(android.content.ComponentName, byte[]); 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 setScreenCaptureDisabled(android.content.ComponentName, boolean);
method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public int setStorageEncryption(android.content.ComponentName, boolean); 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 void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);
method public void uninstallAllUserCaCerts(android.content.ComponentName); method public void uninstallAllUserCaCerts(android.content.ComponentName);

2
api/system-current.txt
View File

@ -5469,7 +5469,6 @@ package android.app.admin {
method public boolean getScreenCaptureDisabled(android.content.ComponentName); method public boolean getScreenCaptureDisabled(android.content.ComponentName);
method public boolean getStorageEncryption(android.content.ComponentName); method public boolean getStorageEncryption(android.content.ComponentName);
method public int getStorageEncryptionStatus(); 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 hasCaCertInstalled(android.content.ComponentName, byte[]);
method public boolean hasGrantedPolicy(android.content.ComponentName, int); method public boolean hasGrantedPolicy(android.content.ComponentName, int);
method public boolean installCaCert(android.content.ComponentName, byte[]); 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 setScreenCaptureDisabled(android.content.ComponentName, boolean);
method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public int setStorageEncryption(android.content.ComponentName, boolean); 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 void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
method public boolean switchUser(android.content.ComponentName, android.os.UserHandle); method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);
method public void uninstallAllUserCaCerts(android.content.ComponentName); method public void uninstallAllUserCaCerts(android.content.ComponentName);

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@ -2698,6 +2698,7 @@ public class DevicePolicyManager {
* <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins, * <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins,
* then it's up to the TrustAgent itself to aggregate the values from all device admins. * then it's up to the TrustAgent itself to aggregate the values from all device admins.
* <p>Consult documentation for the specific TrustAgent to determine legal options parameters. * <p>Consult documentation for the specific TrustAgent to determine legal options parameters.
* @hide
*/ */
public void setTrustAgentConfiguration(ComponentName admin, ComponentName target, public void setTrustAgentConfiguration(ComponentName admin, ComponentName target,
PersistableBundle configuration) { PersistableBundle configuration) {
@ -2724,6 +2725,7 @@ public class DevicePolicyManager {
* for this {@param agent} or calls it with a null configuration, null is returned. * for this {@param agent} or calls it with a null configuration, null is returned.
* @param agent Which component to get enabled features for. * @param agent Which component to get enabled features for.
* @return configuration for the given trust agent. * @return configuration for the given trust agent.
* @hide
*/ */
public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin, public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin,
ComponentName agent) { ComponentName agent) {