diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-16 12:23:18 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-04-17 01:12:30 +0000 |
| commit | 94e15a59b757678949cccb5d783bee1638e84697 (patch) | |
| tree | 1f69ef1533739cba105578e95d03934c1ee87261 /api | |
| parent | fbad74b29cdaf955f48024123bd198fa7c49662c (diff) | |
| download | frameworks_base-94e15a59b757678949cccb5d783bee1638e84697.zip frameworks_base-94e15a59b757678949cccb5d783bee1638e84697.tar.gz frameworks_base-94e15a59b757678949cccb5d783bee1638e84697.tar.bz2 | |
Allow dismissing Keyguard from TrustAgentService
Bug: 19900313
Change-Id: I44d13ee6fe65070327076e73a3ed96c94acdc108
Diffstat (limited to 'api')
| -rw-r--r-- | api/system-current.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index e6b4c60..4b283fe 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30942,7 +30942,8 @@ 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 deprecated void grantTrust(java.lang.CharSequence, long, boolean); + method public final void grantTrust(java.lang.CharSequence, long, int); method public final android.os.IBinder onBind(android.content.Intent); method public boolean onConfigure(java.util.List<android.os.PersistableBundle>); method public void onDeviceLocked(); @@ -30951,6 +30952,8 @@ package android.service.trust { method public void onUnlockAttempt(boolean); method public final void revokeTrust(); method public final void setManagingTrust(boolean); + field public static final int FLAG_GRANT_TRUST_DISMISS_KEYGUARD = 2; // 0x2 + field public static final int FLAG_GRANT_TRUST_INITIATED_BY_USER = 1; // 0x1 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"; } |