Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea

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

Change-Id: I3b337e53b5696121ccb6a72634aebddf9c04f955
This commit is contained in:
Treehugger Robot
2020-07-29 03:08:26 +00:00
committed by Automerger Merge Worker

View File

@@ -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");
}