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: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 am: 9b63618b47

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

Change-Id: I7b1b7b777fcf8b93744e5950a31359ae71c4b98d
This commit is contained in:
Treehugger Robot
2020-07-29 09:05:17 +00:00
committed by Automerger Merge Worker
parent 033bbb2df6 9b63618b47
commit 0c65a47568
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/ConfirmDeviceCredentialActivity.java
View File

@@ -377,7 +377,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
boolean launched = false;
// The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
// CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit
// but dummy challenge value (0L). This will result in ConfirmLockPassword calling
// but fake challenge value (0L). This will result in ConfirmLockPassword calling
// verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the
// difference between ConfirmLockPassword.startVerifyPassword() and
// ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is