Merge "Fix Quiescent Reboot Reason" am: 850866e94a am: 933dacacf8 am: dc2d21b93d am: d355459a3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962 Change-Id: Iab9fd2e4898ac5ce154603accf96a293b66478cf
2021-08-16 19:28:27 +00:00
parent 9b735dcba7 d355459a3c
commit 44000779bd
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -4087,7 +4087,10 @@ public final class PowerManagerService extends SystemService
        if (sQuiescent) {
            // Pass the optional "quiescent" argument to the bootloader to let it know
            // that it should not turn the screen/lights on.
-            reason = reason + ",quiescent";
+            if (reason != ""){
+                reason += ",";
+            }
+            reason = reason + "quiescent";
        }

        SystemProperties.set("sys.powerctl", "reboot," + reason);