diff options
| author | Adrian Roos <roosa@google.com> | 2014-05-16 16:06:28 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-05-16 16:06:28 +0200 |
| commit | 7e03dfcb796ef1a6000a5fd5fda03c9e15ea62e1 (patch) | |
| tree | 2058b03d3495ac0ecab4869d798c4838d0ab63be /api | |
| parent | b0650e8ff3113f9b9dbb6d249339dbd7921b4517 (diff) | |
| download | frameworks_base-7e03dfcb796ef1a6000a5fd5fda03c9e15ea62e1.zip frameworks_base-7e03dfcb796ef1a6000a5fd5fda03c9e15ea62e1.tar.gz frameworks_base-7e03dfcb796ef1a6000a5fd5fda03c9e15ea62e1.tar.bz2 | |
Apply revised TrustAgent API
Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index d3996e4..91f20b7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29,7 +29,7 @@ package android { field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; field public static final java.lang.String BIND_ROUTE_PROVIDER = "android.permission.BIND_ROUTE_PROVIDER"; 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_SERVICE = "android.permission.BIND_TRUST_AGENT_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"; @@ -25327,10 +25327,10 @@ package android.service.trust { public class TrustAgentService extends android.app.Service { ctor public TrustAgentService(); - method protected final void enableTrust(java.lang.String, long, boolean); + method public final void grantTrust(java.lang.CharSequence, long, boolean); method public final android.os.IBinder onBind(android.content.Intent); - method protected void onUnlockAttempt(boolean); - method protected final void revokeTrust(); + method public void onUnlockAttempt(boolean); + method public final void revokeTrust(); 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"; } |