OSDN Git Service

Fix the issue that uncrypt isn't called under quiescent mode
authorTianjie Xu <xunchang@google.com>
Fri, 9 Jun 2017 22:50:14 +0000 (15:50 -0700)
committerTianjie Xu <xunchang@google.com>
Mon, 12 Jun 2017 18:16:59 +0000 (11:16 -0700)
commit3a66fc41e3b1341af37254554610b9e72da4675a
treeef7911dc31f466845a70db29e510ee0dd4cd3800
parentbc626c6358af8553b6f5810b90897472cddb79a6
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/core/java/com/android/server/power/ShutdownThread.java
services/java/com/android/server/SystemServer.java