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

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

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

Change-Id: I458ae96ae298c32cc2f070dddac54d625929332c
parents 0a318adf 95773b6f

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

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,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");

            }