Merge "Update language to comply with Android's inclusive language guidance"

This commit is contained in:
Treehugger Robot
2020-07-29 07:47:02 +00:00
committed by Gerrit Code Review

View File

@@ -318,7 +318,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
boolean launched = false; boolean launched = false;
// The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for // The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
// CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit // 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 // verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the
// difference between ConfirmLockPassword.startVerifyPassword() and // difference between ConfirmLockPassword.startVerifyPassword() and
// ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is // ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is