| commit | 215e5126235942a8e71289d307d363f60cfb743b | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue May 16 17:19:22 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu May 18 00:37:56 2023 +0000 |
| tree | 86d06c1658cf3ad63a9dc0c7143d09ed9e70e6a4 | |
| parent | 650d31e1e29c57f325dc0df199cee1710534417e [diff] |
Fix downgrades on device with FRP enabled
Unfortunately, non-forwards-compatible changes to the PasswordData
format break setting up an older version of Android on a device that had
Factory Reset Protection (FRP) set up on a newer version.
Commit 23070d87275c ("Added changes for storing PIN length in
PasswordData") (http://ag/21983004) made a non-forwards-compatible
change to the PasswordData format by reusing the first two bytes of the
credentialType field as a version number.
Therefore, undo that part of the change, and just use the data length to
determine whether the new pinLength field is present or not.
Bug: 276780938
Test: atest com.android.server.locksettings
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2353f5a9bc31cdef9c4d5329bced9bb6c79fd14d)
Merged-In: Ibf3c91d14a0c6bd9af4403b080532f2739fde119
Change-Id: Ibf3c91d14a0c6bd9af4403b080532f2739fde119