summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-05-08 08:44:59 -0700
committerAlex Klyubin <klyubin@google.com>2015-05-08 08:47:19 -0700
commit68c33d52bfa8aa8c36859799d649b10f0eac3d33 (patch)
treed99634b2f7dc33677ead6dae85db1a35f24a4d7e /docs/html
parentdc9b2dfae2d2c0ef6d7e8d769a78abc17add537a (diff)
downloadframeworks_base-68c33d52bfa8aa8c36859799d649b10f0eac3d33.zip
frameworks_base-68c33d52bfa8aa8c36859799d649b10f0eac3d33.tar.gz
frameworks_base-68c33d52bfa8aa8c36859799d649b10f0eac3d33.tar.bz2
Switch to KeyguardManager.isDeviceSecure.
isKeyguardSecure also returns true when SIM PIN is required. We don't care about that because entering SIM PIN does not unlock keys requiring user authentication. isDeviceSecure returns true only if secure lock screen is set up, which is exactly what we want. Bug: 18088752 Change-Id: I47b21f3351f55c11e8e9bcfd7654762973dd9271
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/training/articles/keystore.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/articles/keystore.jd b/docs/html/training/articles/keystore.jd
index 217db81..fea3b2c 100644
--- a/docs/html/training/articles/keystore.jd
+++ b/docs/html/training/articles/keystore.jd
@@ -129,7 +129,7 @@ of the two modes:
for use as soon as the user unlocks the secure lock screen or confirms their secure lock screen
credentials using the {@link android.app.KeyguardManager#createConfirmDeviceCredentialIntent(CharSequence, CharSequence) KeyguardManager.createConfirmDeviceCredentialIntent}
flow. Each key specifies for how long the authorization remains valid for that key. Such keys
- can only be generated or imported if the secure lock screen is enabled (see {@link android.app.KeyguardManager#isKeyguardSecure Keyguard.isKeyguardSecure}).
+ can only be generated or imported if the secure lock screen is enabled (see {@link android.app.KeyguardManager#isDeviceSecure()}).
These keys become permanently invalidated once the secure lock screen is disabled or forcibly
reset (e.g. by a Device Admin).</li>
<li>User authentication is required for every use of the key. In this mode, a specific operation