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

am: 654174e2af

* commit '654174e2af9deba47c3e421638b2ae9407270d15':
  If we fail to format a blank partition, try recovery

Change-Id: I03c7be4559c8168579edbb40f98b927c4902deb5
This commit is contained in:
Matthew Bouyack 2016-05-03 23:25:20 +00:00 committed by android-build-merger
commit 0697fbddb3

View file

@ -599,6 +599,10 @@ int fs_mgr_mount_all(struct fstab *fstab)
/* 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 &&