diff options
author | Jim Miller <jaggies@google.com> | 2014-08-27 20:42:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-27 20:42:19 +0000 |
commit | f88c2569e94bc0fd2c88470a5d48e140eedf3fca (patch) | |
tree | d13ffb0d3f06ef3c39984ccddffeab0796d508b3 /api | |
parent | 3e97f9d48b6ef6b5ff5fa4e3c738138c0fe14edc (diff) | |
parent | bde3d18dd5748bd24e527c653504346ad012c2dc (diff) | |
download | frameworks_base-f88c2569e94bc0fd2c88470a5d48e140eedf3fca.zip frameworks_base-f88c2569e94bc0fd2c88470a5d48e140eedf3fca.tar.gz frameworks_base-f88c2569e94bc0fd2c88470a5d48e140eedf3fca.tar.bz2 |
Merge "Change name of confirm credentials method after API review" into lmp-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | api/removed.txt | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 5f1acbe..fd4e1b5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4510,8 +4510,8 @@ package android.app { } public class KeyguardManager { + method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); - method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); method public boolean inKeyguardRestrictedInputMode(); method public boolean isKeyguardLocked(); method public boolean isKeyguardSecure(); diff --git a/api/removed.txt b/api/removed.txt index 1b8aef4..1fde099 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -1,3 +1,11 @@ +package android.app { + + public class KeyguardManager { + method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); + } + +} + package android.media { public class AudioFormat { |