Merge tag 'LA.UM.5.8.r1-02700-8x98.0' of https://source.codeaurora.org/external/gigabyte/platform/packages/apps/Settings into n #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bug: 33123882 Test: manual tests Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378 (cherry picked from commit 0f04a5a93f846d6f2d528ab6ae0c9e37d701e438) (cherry picked from commit e9712defa8091f99ce121461321387dbd22ae1df)
Cherry-pick of 436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
(cherry picked from commit 741f99ad22c62746e01d64b63d75b4db3f2be96c)
(cherry picked from commit fdf33d9813401357a35e85d9af86bfbf0adf61a2)
CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 2066804 I17ceca883819a161c4eab2a414abf0b64c320378 resolve merge conflicts of 3964c51bf2 to nyc-dev 2066805 I1078c6e303fc41aeeb370e5d6518d1f16b5837f1 Fix phishing attack in ChooseLockGeneric Change-Id: I249d196a093bc9be1a2b2c4831e5149da237919a CRs-Fixed: 2066805, 2066804
Change-Id: If3ab232505c9d6dd73f931e452a898265cd37331
…g/external/gigabyte/platform/packages/apps/Settings into n "LA.UM.5.8.r1-02700-8x98.0"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.