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 am: d7e5e940ea am: c397bd301d am: 4727c3b1c5

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

Change-Id: I77609347466b45e081c14fd64274f9844dd9822c
This commit is contained in:
Treehugger Robot
2020-07-29 03:43:24 +00:00
committed by Automerger Merge Worker
parent ad253e7774 4727c3b1c5
commit a32b11f45b
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}
*/
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");
}