diff options
| author | 2017-06-12 23:55:23 +0000 | |
|---|---|---|
| committer | 2017-06-12 23:55:23 +0000 | |
| commit | d04d501ce733f02a08951ca5d019773ea429074f (patch) | |
| tree | e7c6d8733a59155ee30cc33c99995426b7189f00 /services/java/com | |
| parent | 2fa5800da94ba493d54d31ce1e71ae483bcb9a76 (diff) | |
| parent | f40f29754662ab88040582f26351e4ed0e1381e7 (diff) | |
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546
Change-Id: I06fa703be593348db7eed68e3905929262e43a9c
Diffstat (limited to 'services/java/com')
| -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 ec1a569b5dd9..909f82db9407 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -436,7 +436,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; |