Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev

Browse Source 
am: f40f297546

Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
This commit is contained in:
Tianjie Xu
2017-06-13 00:58:53 +00:00
committed by android-build-merger
parent aec6b4749a f40f297546
commit c7fed42403
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/SystemServer.java
View File

@@ -454,7 +454,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;