diff options
| author | 2017-06-13 00:58:53 +0000 | |
|---|---|---|
| committer | 2017-06-13 00:58:53 +0000 | |
| commit | c7fed4240323383a12fd10adad91cc767404e2f0 (patch) | |
| tree | 649846a44828735fa3e52c7aa71205cf8f2c286e /services/java | |
| parent | aec6b4749ae4f10876e88fafedcd85e17c3a1808 (diff) | |
| parent | f40f29754662ab88040582f26351e4ed0e1381e7 (diff) | |
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
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 272c11b985c5..eca285a1a27b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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; |