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

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

Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev

parents b655e756 b1474f44

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -5454,7 +5454,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<java.lang.String> getTrustAgentFeaturesEnabled(android.content.ComponentName, android.content.ComponentName);

    method public boolean getUninstallBlocked(android.content.ComponentName, java.lang.String);

    method public boolean hasCaCertInstalled(byte[]);

    method public boolean hasGrantedPolicy(android.content.ComponentName, int);
@@ -5502,7 +5501,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 setTrustAgentFeaturesEnabled(android.content.ComponentName, android.content.ComponentName, java.util.List<java.lang.String>);

    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

+4 −2
Original line number Diff line number Diff line
@@ -2562,6 +2562,7 @@ public class DevicePolicyManager { 
     * @param agent Which component to enable features for.

     * @param features List of features to enable. Consult specific TrustAgent documentation for

     * the feature list.

     * @hide

     */

    public void setTrustAgentFeaturesEnabled(ComponentName admin, ComponentName agent,

            List<String> features) {
@@ -2582,6 +2583,7 @@ public class DevicePolicyManager { 
     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

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

     * @return List of enabled features.

     * @hide

     */

    public List<String> getTrustAgentFeaturesEnabled(ComponentName admin, ComponentName agent) {

        if (mService != null) {

core/java/android/service/trust/TrustAgentService.java

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class TrustAgentService extends Service { 
    /**

     * A white list of features that the given trust agent should support when otherwise disabled

     * by device policy.

     * @hide

     */

    public static final String KEY_FEATURES = "trust_agent_features";
@@ -184,6 +185,7 @@ public class TrustAgentService extends Service { 
     *

     * @param options Option feature bundle.

     * @return true if the {@link TrustAgentService} supports this feature.

     * @hide

     */

    public boolean onSetTrustAgentFeaturesEnabled(Bundle options) {

        return false;