diff options
| author | Adrian Roos <roosa@google.com> | 2014-11-20 21:38:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 21:38:14 +0000 |
| commit | af6e657ab873623ed0e94bc8bcf8ed03f6bbe167 (patch) | |
| tree | bfda933ef4d6d89fd0167ad5195aea39dd235c99 /api/current.txt | |
| parent | 25418aabb687b39a9e5bbe7c387bfcb81bde1222 (diff) | |
| parent | 50bfeec868157106e8b60abf8964cb24462af182 (diff) | |
| download | frameworks_base-af6e657ab873623ed0e94bc8bcf8ed03f6bbe167.zip frameworks_base-af6e657ab873623ed0e94bc8bcf8ed03f6bbe167.tar.gz frameworks_base-af6e657ab873623ed0e94bc8bcf8ed03f6bbe167.tar.bz2 | |
Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index fb26daf..c751ef3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4414,7 +4414,7 @@ package android.app { method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public boolean inKeyguardRestrictedInputMode(); - method public boolean isKeyguardInTrustedState(); + method public boolean isDeviceLocked(); method public boolean isKeyguardLocked(); method public boolean isKeyguardSecure(); method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String); |