diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-04 17:02:57 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-06-04 15:04:19 +0000 |
| commit | b803ad3c2cefaba57063385ecab1be27dd2636b0 (patch) | |
| tree | 8aa180e1ae7b59b01c5531aa73c56a85f030c489 /core/java | |
| parent | 8988dbb6dff983c986aa0cc1c05b4aaf8c730bbf (diff) | |
Hide TrustAgentService in lmp-preview - DO NOT MERGE
Bug: 15287044
Change-Id: Iba0d53b87bcb4bddccec89cf943ed65491aa9d76
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/service/trust/TrustAgentService.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 77b1acffb82d..d725873f5f79 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -34,7 +34,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.service.trust.TrustAgentService; import android.util.Log; import com.android.org.conscrypt.TrustedCertificateStore; @@ -1307,7 +1306,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 a6cddae80688..b3fb560b9dab 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -17,6 +17,7 @@ package android.service.trust; import android.Manifest; +import android.annotation.PrivateApi; import android.annotation.SdkConstant; import android.app.Service; import android.content.ComponentName; @@ -56,7 +57,10 @@ import android.util.Slog; * <pre> * <trust-agent xmlns:android="http://schemas.android.com/apk/res/android" * android:settingsActivity=".TrustAgentSettings" /></pre> + * + * @hide */ +@PrivateApi public class TrustAgentService extends Service { private final String TAG = TrustAgentService.class.getSimpleName() + "[" + getClass().getSimpleName() + "]"; |