commit 7a310fbb5815b3c1ad965d58f4976afca2a721c6
author Kenny Root <kroot@google.com> Thu Apr 04 08:39:57 2013 -0700
committer Kenny Root <kroot@google.com> Thu Apr 04 09:41:43 2013 -0700
tree bcccc7411e3d1597b9fa8c71c85c92c8e33af1e3
parent 2ecc7a1efbb21d86d38b9e0348dfbf0e1213d920

keystore: fix upgrades

During an upgrade, a blob would be written out to disk. Whenever a blob
is written to disk, it is encrypted in-place. After upgrade, keystore
would attempt to use the blob, but get garbage instead of what it
expected since it was encrypted.

This moves the work of writing up a level so it can then re-read the
blob after upgrade.

(cherry picked from commit cfeae072c96d84f286ddbf0aff8055c12c7c4f15)

Bug: 7249554
Change-Id: I1be5ecafa6d39fdcce10d9d3623f23440cac8c6e