diff options
| author | Adrian Roos <roosa@google.com> | 2015-03-11 00:12:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-11 00:12:56 +0000 |
| commit | bd5e03b6d996aa39a6f607a55ffd0691a55b1cee (patch) | |
| tree | 704906b3cb84fd2af3a661d7d41f3461038a1cac /services | |
| parent | b7f101225e6fa951df262eeacf235ffa5f6cc7e3 (diff) | |
| parent | a43fd03b9b23f9ad0deae9ee69ee80aaa1433cdb (diff) | |
| download | frameworks_base-bd5e03b6d996aa39a6f607a55ffd0691a55b1cee.zip frameworks_base-bd5e03b6d996aa39a6f607a55ffd0691a55b1cee.tar.gz frameworks_base-bd5e03b6d996aa39a6f607a55ffd0691a55b1cee.tar.bz2 | |
Merge "Notify TrustAgentService when device policy configuration no longer applies"
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 583cc6b..0109313 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) { |