diff options
| author | Adrian Roos <roosa@google.com> | 2014-07-29 13:15:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:04 +0000 |
| commit | 1cc41c938cfe587441a63f0d6176f59fcf2f25b4 (patch) | |
| tree | 98c7144f8cca3b46411549aad4bbdcaa5376df00 /core/java | |
| parent | a8da02c914ac4621cc94c1ba5fd36e3a885980e4 (diff) | |
| parent | a06d5ca1d96af3555ad4e384994e6321a0c5bb9c (diff) | |
| download | frameworks_base-1cc41c938cfe587441a63f0d6176f59fcf2f25b4.zip frameworks_base-1cc41c938cfe587441a63f0d6176f59fcf2f25b4.tar.gz frameworks_base-1cc41c938cfe587441a63f0d6176f59fcf2f25b4.tar.bz2 | |
Merge "Make TrustAgentService a SystemApi" into lmp-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/service/trust/TrustAgentService.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 20a0072..b84eca2 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1568,7 +1568,7 @@ public class DevicePolicyManager { public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 1 << 3; /** - * Ignore {@link TrustAgentService} state on secure keyguard screens + * Ignore trust agent state on secure keyguard screens * (e.g. PIN/Pattern/Password). */ public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 1 << 4; diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java index 333a892..61da85f 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -18,6 +18,7 @@ package android.service.trust; import android.Manifest; import android.annotation.SdkConstant; +import android.annotation.SystemApi; import android.app.Service; import android.app.admin.DevicePolicyManager; import android.content.ComponentName; @@ -58,7 +59,10 @@ import android.util.Slog; * <pre> * <trust-agent xmlns:android="http://schemas.android.com/apk/res/android" * android:settingsActivity=".TrustAgentSettings" /></pre> + * + * @hide */ +@SystemApi public class TrustAgentService extends Service { private final String TAG = TrustAgentService.class.getSimpleName() + "[" + getClass().getSimpleName() + "]"; |