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

Commit 95773b6f 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" am: ba534426 

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

Change-Id: I8470490508ae353636146d760564449938999daa
parents da02fb34 ba534426

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

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
         * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}

         */

        void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) {

            // Sanity check. We should never get here without confirming user's existing password.

            // We should never get here without confirming user's existing password.

            if (!mPasswordConfirmed) {

                throw new IllegalStateException("Tried to update password without confirming it");

            }