From 3a66fc41e3b1341af37254554610b9e72da4675a Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Fri, 9 Jun 2017 15:50:14 -0700 Subject: Fix the issue that uncrypt isn't called under quiescent mode OTA fails on fugu under quiescent mode because the reboot reason changes from "recovery-update" to "recovery-update,quiescent". The new reason isn't checked in shutdown thread so that shutdown thread doesn't call uncrypt properly before rebooting into recovery. Bug: 62324707 Test: Recreated and fixed the "block.map" missing failure on fugu. Change-Id: I110653cd64dbbdc71e89ead2197bf023a7c054e8 --- services/java/com/android/server/SystemServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services/java') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6f53099a8627..cc392712124b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -449,7 +449,7 @@ public final class SystemServer { // If '/cache/recovery/block.map' hasn't been created, stop the // reboot which will fail for sure, and get a chance to capture a // bugreport when that's still feasible. (Bug: 26444951) - if (PowerManager.REBOOT_RECOVERY_UPDATE.equals(reason)) { + if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) { File packageFile = new File(UNCRYPT_PACKAGE_FILE); if (packageFile.exists()) { String filename = null; -- cgit v1.2.3-59-g8ed1b