Merge "Update language to comply with Android's inclusive language guidance"
This commit is contained in:
@@ -761,7 +761,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");
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user