diff options
| author | Adrian Roos <roosa@google.com> | 2015-03-09 19:10:15 +0100 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-03-09 19:14:33 +0100 |
| commit | a43fd03b9b23f9ad0deae9ee69ee80aaa1433cdb (patch) | |
| tree | 70a46df079bec1612274fdc1732e24dc342cfc87 /services | |
| parent | f855b0d2d0c0c157d657668fcb98097e2aca097e (diff) | |
| download | frameworks_base-a43fd03b9b23f9ad0deae9ee69ee80aaa1433cdb.zip frameworks_base-a43fd03b9b23f9ad0deae9ee69ee80aaa1433cdb.tar.gz frameworks_base-a43fd03b9b23f9ad0deae9ee69ee80aaa1433cdb.tar.bz2 | |
Notify TrustAgentService when device policy configuration no longer applies
Also updates the outdated javadoc to match the current API.
Bug: 19500731
Change-Id: I7976bbcc815b84e168718672377a963ffea68c51
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustAgentWrapper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/trust/TrustAgentWrapper.java b/services/core/java/com/android/server/trust/TrustAgentWrapper.java index 57b204d..772f831 100644 --- a/services/core/java/com/android/server/trust/TrustAgentWrapper.java +++ b/services/core/java/com/android/server/trust/TrustAgentWrapper.java @@ -40,6 +40,7 @@ import android.util.Slog; import android.service.trust.ITrustAgentService; import android.service.trust.ITrustAgentServiceCallback; +import java.util.Collections; import java.util.List; /** @@ -359,6 +360,8 @@ public class TrustAgentWrapper { mSetTrustAgentFeaturesToken = new Binder(); mTrustAgentService.onConfigure(config, mSetTrustAgentFeaturesToken); } + } else { + mTrustAgentService.onConfigure(Collections.EMPTY_LIST, null); } final long maxTimeToLock = dpm.getMaximumTimeToLock(null); if (maxTimeToLock != mMaximumTimeToLock) { |