Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c65a475 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2a am: 4d421a47 am: 7b10a293 am: 9b63618b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I7b1b7b777fcf8b93744e5950a31359ae71c4b98d
parents 033bbb2d 9b63618b

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

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { 
        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