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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962 Change-Id: Ieb6970f1ca8303baa8f27744ec24c62dda98867b
2021-08-16 18:41:34 +00:00
parent e99475ac37 933dacacf8
commit dc2d21b93d
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);