Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b46e4806 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents 8ffb574a bc4f2ccf

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/admin/DevicePolicyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -2698,6 +2698,7 @@ public class DevicePolicyManager { 
     * <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.

     * <p>Consult documentation for the specific TrustAgent to determine legal options parameters.

     * @hide

     */

    public void setTrustAgentConfiguration(ComponentName admin, ComponentName target,

            PersistableBundle configuration) {
@@ -2724,6 +2725,7 @@ public class DevicePolicyManager { 
     * for this {@param agent} or calls it with a null configuration, null is returned.

     * @param agent Which component to get enabled features for.

     * @return configuration for the given trust agent.

     * @hide

     */

    public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin,

            ComponentName agent) {