OSDN Git Service

Log the error when uncrypt timeouts
authorTianjie Xu <xunchang@google.com>
Sat, 24 Sep 2016 22:39:56 +0000 (15:39 -0700)
committerTianjie Xu <xunchang@google.com>
Wed, 28 Sep 2016 18:19:03 +0000 (11:19 -0700)
commit2a03586998b857bb13f1119005be186e4a88ff02
treee5ace72a89114990527394e1f769aadf80a9f626
parent0f53f6ffa26ac4a6964957408e695e9aa4095429
Log the error when uncrypt timeouts

Log the error code to uncrypt_status if uncrypt gets killed because
of timeout.

Test: We log the error code correctly in uncrypt_status when uncrypt timeouts.
Bug: 31603820
Change-Id: Ia623c333714295e68f4269257fbb4297a867e42b
(cherry picked from commit 036d08638e6a5f849847a32d794ad34d7dec1368)
core/java/android/os/RecoverySystem.java
services/core/java/com/android/server/power/ShutdownThread.java