From acc855f711ae7bce20e4fc896c829e135a6801fc Mon Sep 17 00:00:00 2001
From: Tom Marshall <tdm@cyngn.com>
Date: Fri, 6 Nov 2015 16:27:01 -0800
Subject: recovery: Handle oemunlock command

 * Conditionally compile support based on TARGET_HAVE_OEMLOCK.
 * Use liboemunlock for device specific support.

Change-Id: I1cf1fef8e30075b0586bb86625b7df49723974cb
---
 roots.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'roots.cpp')

diff --git a/roots.cpp b/roots.cpp
index fda8f61..d27a2dd 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -348,7 +348,7 @@ static int rmtree_except(const char* path, const char* except)
     return rc;
 }
 
-int format_volume(const char* volume) {
+int format_volume(const char* volume, bool force) {
     if (strcmp(volume, "media") == 0) {
         if (!vdc->isEmulatedStorage()) {
             return 0;
@@ -378,7 +378,7 @@ int format_volume(const char* volume) {
         return -1;
     }
 
-    if (strcmp(volume, "/data") == 0 && vdc->isEmulatedStorage()) {
+    if (!force && strcmp(volume, "/data") == 0 && vdc->isEmulatedStorage()) {
         if (ensure_path_mounted("/data") == 0) {
             // Preserve .layout_version to avoid "nesting bug"
             LOGI("Preserving layout version\n");
-- 
cgit v1.1