Merge "MetadataCrypt: extend timeout for low performance device" am: c2b0578e19
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2422559 Change-Id: I0713915e7e5123269462fbff51c449910262fc56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
a38a2fa330
1 changed files with 1 additions and 1 deletions
|
@ -194,7 +194,7 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const std::string&
|
||||||
LOG(ERROR) << "Failed to populate default-key device " << dm_name;
|
LOG(ERROR) << "Failed to populate default-key device " << dm_name;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!dm.WaitForDevice(dm_name, 5s, crypto_blkdev)) {
|
if (!dm.WaitForDevice(dm_name, 20s, crypto_blkdev)) {
|
||||||
LOG(ERROR) << "Failed to wait for default-key device " << dm_name;
|
LOG(ERROR) << "Failed to wait for default-key device " << dm_name;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue