diff --git a/kernel/power/main.c b/kernel/power/main.c
index 641255b47d52..e80b947848e5 100755
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -984,6 +984,9 @@ static ssize_t pm_freeze_timeout_store(struct kobject *kobj,
 {
 	unsigned long val;
 
+	if (IS_ENABLED(CONFIG_ANDROID))
+		return n;
+
 	if (kstrtoul(buf, 10, &val))
 		return -EINVAL;
 
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 1ae7f93efde9..3c697433dc0a 100755
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -27,7 +27,8 @@
 /*
  * Timeout for stopping processes
  */
-unsigned int __read_mostly freeze_timeout_msecs = 20 * MSEC_PER_SEC;
+unsigned int __read_mostly freeze_timeout_msecs =
+	IS_ENABLED(CONFIG_ANDROID) ? MSEC_PER_SEC : 20 * MSEC_PER_SEC;
 
 static int try_to_freeze_tasks(bool user_only)
 {