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

Commit e71a2be2 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove TrustAgent whitelisting API""

parents 7863658c b37f5182

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5496,6 +5496,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[]);
@@ -5546,6 +5547,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 void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5597,6 +5597,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[]);
@@ -5648,6 +5649,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 void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

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

+0 −2
Original line number Diff line number Diff line
@@ -2900,7 +2900,6 @@ 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) {
@@ -2926,7 +2925,6 @@ 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) {