commit cb5263a3a167730e3b0991b8b75822e4f09a6149
author Lakshman Annadorai <lakshmana@google.com> Wed Jun 30 22:47:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 30 22:47:02 2021 +0000
tree 25b75eb6f8866a57e23f4b4eadc8121e71e9fd60
parent 6593933d2b395a312cf2eb2fa623b3b4ce20cb7b
parent e0c89adf4648e078a7eb63c951f8a430f3e4b5c1

Update power cycle state to SHUTDOWN_ENTER on SHUTDOWN intent. am: e0c89adf46

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/15144076

Change-Id: I1dcb9494598cdbdcdfe31cb78396f6e817768e55

src/com/android/internal/car/CarServiceHelperService.java

diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index a001482..8e82316 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -186,15 +186,15 @@
                     || (intent.getFlags() & Intent.FLAG_RECEIVER_FOREGROUND) == 0) {
                 return;
             }
-            int powerCycle = PowerCycle.POWER_CYCLE_SUSPEND;
+            int powerCycle = PowerCycle.POWER_CYCLE_SHUTDOWN_ENTER;
             try {
                 mCarWatchdogDaemonHelper.notifySystemStateChange(StateType.POWER_CYCLE,
                         powerCycle, /* arg2= */ 0);
                 if (DBG) {
-                    Slogf.d(TAG, "Notified car watchdog daemon a power cycle(%d)", powerCycle);
+                    Slogf.d(TAG, "Notified car watchdog daemon of power cycle(%d)", powerCycle);
                 }
             } catch (RemoteException | RuntimeException e) {
-                Slogf.w(TAG, "Notifying system state change failed: %s", e);
+                Slogf.w(TAG, "Notifying power cycle state change failed: %s", e);
             }
         }
     };