From 5eb14cc3fff68b47ead7519e7ffe6b2d21437c0d Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Tue, 9 Mar 2021 17:09:04 +0000
Subject: [PATCH] Change storage check timeout from 300ms to 5mins

Bug: 177248242
Test: Able to boot device without any warnings or errors
Change-Id: I16f6a4225cd772c462ae379d06fda4e9c687fa8c
Merged-In: I16f6a4225cd772c462ae379d06fda4e9c687fa8c
(cherry picked from commit 99f380447fa4feaa7a133313da222f55dc1d9bec)
---
 core/jni/com_android_internal_os_Zygote.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index cf96fe63f82c7..0bed29b7ba287 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -193,7 +193,7 @@ static constexpr unsigned int STORAGE_DIR_CHECK_MAX_INTERVAL_US = 1000;
  * If it exceeds 2s, PROC_START_TIMEOUT_MSG will kill the starting app anyway,
  * so it's fine to assume max retries is 5 mins.
  */
-static constexpr int STORAGE_DIR_CHECK_TIMEOUT_US = 1000 * 60 * 5;
+static constexpr int STORAGE_DIR_CHECK_TIMEOUT_US = 1000 * 1000 * 60 * 5;
 
 /**
  * A helper class containing accounting information for USAPs.