diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-08 18:06:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 18:06:35 +0000 |
| commit | b954ecda0922a894835f224bead0f06ec7a8ef17 (patch) | |
| tree | bbeb2eb649913aa9c274534d974920cbafcef9a7 /docs/html | |
| parent | 5b56159b8e2e1c494b4d8fb9d2b0aeef59aaddd4 (diff) | |
| parent | 68c33d52bfa8aa8c36859799d649b10f0eac3d33 (diff) | |
| download | frameworks_base-b954ecda0922a894835f224bead0f06ec7a8ef17.zip frameworks_base-b954ecda0922a894835f224bead0f06ec7a8ef17.tar.gz frameworks_base-b954ecda0922a894835f224bead0f06ec7a8ef17.tar.bz2 | |
Merge "Switch to KeyguardManager.isDeviceSecure." into mnc-dev
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/training/articles/keystore.jd | 2 |
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 |