commit 6846d22629e7bf9d53006d4f40c9c5f81b2b45f0
author Matthew Bouyack <mbouyack@google.com> Tue May 03 23:18:15 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 03 23:18:16 2016 +0000
tree 6167a5995a98194706a5a719241fb31189c0f7df
parent c04a11c9e3bc1a314f05561648a0db6da767d03d
parent 9c59cbcf379a82b6964e174812c8e4e0cc7e69f6

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

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 70acd38..6de8817 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -602,6 +602,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 &&