OSDN Git Service

Preserve FRP lock if wiped during SUW
authorRussell Brenner <russellbrenner@google.com>
Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 2 Dec 2015 01:41:41 +0000 (17:41 -0800)
commitf4b8ad6c3105fa17fba85e852b710e48aaf0794d
tree30065bcab4b729b5857c795fddff1e977339b7b2
parentec25157ad840a4932c012f75eda1f239e6b4ef12
Preserve FRP lock if wiped during SUW

Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
src/com/android/settings/MasterClearConfirm.java