PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I458ae96ae298c32cc2f070dddac54d625929332c
This commit is contained in:
Treehugger Robot
2020-07-29 02:48:26 +00:00
committed by Automerger Merge Worker
parent 0a318adf46 95773b6f1a
commit d7e5e940ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -772,7 +772,7 @@ public class ChooseLockGeneric extends SettingsActivity {
* {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED} * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
*/ */
void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) { 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) { if (!mPasswordConfirmed) {
throw new IllegalStateException("Tried to update password without confirming it"); throw new IllegalStateException("Tried to update password without confirming it");
} }