diff options
| author | 2017-06-13 00:46:27 +0000 | |
|---|---|---|
| committer | 2017-06-13 00:46:27 +0000 | |
| commit | 40b3f29341b72f83ced0c96d662967d6ebf1f622 (patch) | |
| tree | 80f1817ff89dd0a885a85d2bb1ff3da514c9c3d2 /services/java | |
| parent | cb6196277f7f9fb10fe57d416e66434e90ca94ce (diff) | |
| parent | d04d501ce733f02a08951ca5d019773ea429074f (diff) | |
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546
am: d04d501ce7
Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 9a756b18c4db..d5e19931460b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -441,7 +441,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; |