Delete non-volatile storage file for NFCEE ID 0xF5.

Delete non-volatile storage file for NFCEE ID 0xF5, which
corresponds to UICC slot 2 on chip 20795.

Change-Id: I1ad2016f93af4fda42c8b6e44672cc39529cb09e

1 files changed, 7 insertions, 1 deletions

diff --git a/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp b/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp
index 0168517..f921f99 100644
--- a/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp
+++ b/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp
@@ -220,6 +220,8 @@ void delete_hal_non_volatile_store (bool forceDelete)
     remove (filename);
     snprintf (filename, sizeof(filename), "%s%u", fn.c_str(), HC_F2_NV_BLOCK);
     remove (filename);
+    snprintf (filename, sizeof(filename), "%s%u", fn.c_str(), HC_F5_NV_BLOCK);
+    remove (filename);
 }
 
 
@@ -259,7 +261,11 @@ void verify_hal_non_volatile_store ()
             {
                 snprintf (filename, sizeof(filename), "%s%u", fn.c_str(), HC_F2_NV_BLOCK);
                 if (crcChecksumVerifyIntegrity (filename))
-                    isValid = true;
+                {
+                    snprintf (filename, sizeof(filename), "%s%u", fn.c_str(), HC_F5_NV_BLOCK);
+                    if (crcChecksumVerifyIntegrity (filename))
+                        isValid = true;
+                }
             }
         }
     }