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: Ic56fccb65c171d4f21527bc78a7b4eb76edcb348
This commit is contained in:
Matthew Bouyack 2016-05-03 23:22:58 +00:00 committed by android-build-merger
commit 654174e2af
1 changed files with 4 additions and 0 deletions

View File

@ -602,6 +602,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 &&