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)
committerRussell Brenner <russellbrenner@google.com>
Fri, 13 Nov 2015 18:08:51 +0000 (18:08 +0000)
commitde4fc8eb2a27797adaa7afac98fa3a2a7ffd8f99
tree9a2c3893239adcabcb24e3568fbfebee47c8a750
parent1538dde4fbb00617bfd1d51f958f32ba4d68ff12
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