commit 2e7620594ef9a1353d0cc191e5e4172f88353221
author Matthew Bouyack <mbouyack@google.com> Tue May 03 23:22:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 23:22:58 2016 +0000
tree 068fd0e87d4bf3019ec5cc93d934bf3698296879
parent 40d1d10a8489d2036a0980a67180f75db4f52f9e
parent 6846d22629e7bf9d53006d4f40c9c5f81b2b45f0

Merge "If we fail to format a blank partition, try recovery" into nyc-dev
am: 6846d22629

* commit '6846d22629e7bf9d53006d4f40c9c5f81b2b45f0':
  If we fail to format a blank partition, try recovery

Change-Id: I6879f99f6901b24a3a51a35c3fc629c49bb64091

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 9fc5999..b549c85 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -599,6 +599,10 @@
                 /* Let's replay the mount actions. */
                 i = top_idx - 1;
                 continue;
+            } else {
+                ERROR("%s(): Format failed. Suggest recovery...\n", __func__);
+                encryptable = FS_MGR_MNTALL_DEV_NEEDS_RECOVERY;
+                continue;
             }
         }
         if (mret && mount_errno != EBUSY && mount_errno != EACCES &&