am c587269c: vold: Increase timeout due to selinux changes

* commit 'c587269c5a34d4e7412ff42e53ed6312359a8505':
  vold: Increase timeout due to selinux changes
gugelfrei
Ken Sumrall 11 years ago committed by Android Git Automerger
commit e88e1eb745

@ -928,7 +928,7 @@ static int wait_and_unmount(char *mountpoint)
return rc;
}
#define DATA_PREP_TIMEOUT 100
#define DATA_PREP_TIMEOUT 200
static int prep_data_fs(void)
{
int i;
@ -938,7 +938,7 @@ static int prep_data_fs(void)
property_set("vold.decrypt", "trigger_post_fs_data");
SLOGD("Just triggered post_fs_data\n");
/* Wait a max of 25 seconds, hopefully it takes much less */
/* Wait a max of 50 seconds, hopefully it takes much less */
for (i=0; i<DATA_PREP_TIMEOUT; i++) {
char p[PROPERTY_VALUE_MAX];
@ -951,6 +951,7 @@ static int prep_data_fs(void)
}
if (i == DATA_PREP_TIMEOUT) {
/* Ugh, we failed to prep /data in time. Bail. */
SLOGE("post_fs_data timed out!\n");
return -1;
} else {
SLOGD("post_fs_data done\n");

Loading…
Cancel
Save