diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-04 13:18:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-04 13:18:40 +0000 |
| commit | 1e9021aef89d53eb08d0e8a4e017c9e79d260241 (patch) | |
| tree | 03274d0ca036f85ca0e45c7ffa68a3cf7964116f /core/java/android | |
| parent | d55c56b86e9ec7b15f5b9e715ed009aed6ba9bb1 (diff) | |
| parent | 18ea893a2319e2a192188d2288bb881149c9b06e (diff) | |
Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/service/trust/TrustAgentService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java index 98f70f4023d9..a6cddae80688 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -33,6 +33,8 @@ import android.util.Slog; * A service that notifies the system about whether it believes the environment of the device * to be trusted. * + * <p>Trust agents may only be provided by the platform.</p> + * * <p>To extend this class, you must declare the service in your manifest file with * the {@link android.Manifest.permission#BIND_TRUST_AGENT} permission * and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p> |