commit fedb8d4dd10354cd3b18dd7fc2aa73054c1206c4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Feb 15 05:28:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 15 05:28:05 2019 +0000
tree 59d90ac39adb553a9979b7a4d162fa0cc36805d2
parent 63e0409cbb63f87b32978ad179091ea811c352d7
parent e52c18a41c31a092848b14c0b3de6a1723e41f1a

Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: d61c2adf09 -s ours am: 44ace71846 -s ours am skip reason: subject contains skip directive"

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 236e3d9..ec1e835 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -184,7 +184,7 @@
         } else {
             bpBundle = new Bundle();
             bpBundle.putString(BiometricPrompt.KEY_TITLE, mTitle);
-            bpBundle.putString(BiometricPrompt.KEY_SUBTITLE, mDetails);
+            bpBundle.putString(BiometricPrompt.KEY_DESCRIPTION, mDetails);
         }
 
         boolean launchedBiometric = false;