OSDN Git Service

Wait for uncrypt to finish before rebooting
authorTao Bao <tbao@google.com>
Thu, 21 May 2015 23:25:19 +0000 (16:25 -0700)
committerTao Bao <tbao@google.com>
Tue, 9 Jun 2015 21:58:13 +0000 (14:58 -0700)
commitfa861429f7ec0b9f83a2baacc3c6fb680467039b
tree38f47ba09cce34861bf46d299d2434a84aea1f80
parentc521b10854ebdc227d6f32649c627a548caef2e4
Wait for uncrypt to finish before rebooting

/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Also pick up the two NPE fixes in commits
9bb765448df43d41e0a3edb7de1d1641c9251c35 and
da3f63ffb87397943546a7c5c893ce98f2489df2.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 90237f7beb55dae79cdcba5271f96be778573737)
Change-Id: Ibf2fc80032967e5f6cda3cd469005dd29665c87c
core/java/android/os/RecoverySystem.java
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
services/core/java/com/android/server/power/PowerManagerService.java
services/core/java/com/android/server/power/ShutdownThread.java