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 /api | |
| 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 'api')
| -rw-r--r-- | api/current.txt | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/api/current.txt b/api/current.txt index cd75146..85d4c71 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29,7 +29,6 @@ package android { field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; - field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION"; field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE"; @@ -27410,22 +27409,6 @@ package android.service.textservice { } -package android.service.trust { - - public class TrustAgentService extends android.app.Service { - ctor public TrustAgentService(); - method public final void grantTrust(java.lang.CharSequence, long, boolean); - method public final android.os.IBinder onBind(android.content.Intent); - method public boolean onSetTrustAgentFeaturesEnabled(android.os.Bundle); - method public void onUnlockAttempt(boolean); - method public final void revokeTrust(); - field public static final java.lang.String KEY_FEATURES = "trust_agent_features"; - field public static final java.lang.String SERVICE_INTERFACE = "android.service.trust.TrustAgentService"; - field public static final java.lang.String TRUST_AGENT_META_DATA = "android.service.trust.trustagent"; - } - -} - package android.service.voice { public class AlwaysOnHotwordDetector { |