summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-07-17 02:09:02 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2009-07-17 02:09:02 -0700
commit9e1bd09c15f1fe391856ed53ff352b27f5017628 (patch)
tree8a62f0df740699ba3dde554820a5b099fa3281c4
parent07bca345514d4d20aab4e83a00cce2311a72b2fc (diff)
parent97a67cc281805566d429d4ca6570348fcf6dabd9 (diff)
am 97a67cc2: Merge change 7544 into donut
Merge commit '97a67cc281805566d429d4ca6570348fcf6dabd9' * commit '97a67cc281805566d429d4ca6570348fcf6dabd9': sdutil: Up the mount/unmount wait times to account for disk check + reaper time
-rw-r--r--media/sdutils/sdutil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/sdutils/sdutil.cpp b/media/sdutils/sdutil.cpp
index 6f0cdfb2c525..fe1187897126 100644
--- a/media/sdutils/sdutil.cpp
+++ b/media/sdutils/sdutil.cpp
@@ -88,7 +88,7 @@ static int mount(const char* path) {
String16 string(path);
gMountService->mountMedia(string);
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 60; i++) {
if (isMounted(path)) {
return 0;
}
@@ -103,7 +103,7 @@ static int unmount(const char* path) {
String16 string(path);
gMountService->unmountMedia(string);
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 20; i++) {
if (!isMounted(path)) {
return 0;
}