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

Commit 7b10a293 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

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

Change-Id: I47066c39d6fced154b263febab7a3fb0a1e56049
parents 0dd2798b 4d421a47

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