commit 5a7e857aee2ebba4e369936aa5acdc7bcecf83e7
author Evan Chu <evanchu@broadcom.com> Wed May 01 10:10:31 2013 -0400
committer Martijn Coenen <maco@google.com> Mon Aug 05 08:56:44 2013 -0700
tree a044b704dea4f8c1071483087b8e21f7a5e311e9
parent 0976d37081fae8bcd4fc4dcf7996e1ce194fb4b1

When preserving non-volatile storage files, detect corruption.

When non-volatile storage files are preserved during cold boot,
JNI must detect corruption in their contents by verifying their
checksums.

Change-Id: I191ac013f12dabda43e590449a80523bc42c0c90

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index 945de1e..145c3de 100755
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -127,12 +127,12 @@
 
     initializeGlobalAppLogLevel ();
 
+    verify_stack_non_volatile_store ();
     if ( GetNumValue ( NAME_PRESERVE_STORAGE, (char*)&num, sizeof ( num ) ) &&
             (num == 1) )
         ALOGD ("%s: preserve stack NV store", __FUNCTION__);
     else
     {
-        verify_stack_non_volatile_store ();
         delete_stack_non_volatile_store (FALSE);
     }