| commit | 4d421a47dc877954bbd1f16ddf327be1158508a8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 29 08:07:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 29 08:07:46 2020 +0000 |
| tree | fd6914baa7bd2cff5453a44007640496c2a3e62e | |
| parent | f130a08d5edb4d851b74cb685589fcad8fa87940 [diff] | |
| parent | 7df1fb2af12fff41016656a2c5a0beb2bf94dcc4 [diff] |
Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789 Change-Id: I02ccfae146dd0e360fa34592a3bb21f5c2501833
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index 8476f92..fbc2c3c 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -318,7 +318,7 @@ boolean launched = false; // The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for // CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit - // but dummy challenge value (0L). This will result in ConfirmLockPassword calling + // but fake challenge value (0L). This will result in ConfirmLockPassword calling // verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the // difference between ConfirmLockPassword.startVerifyPassword() and // ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is