Commit: 4405fb0b202fdc1cd7b59c6d8348d0715b7bfd70 - system-hardware-interfaces (git)

system/hardware/interfaces

Commit MetaInfo

• Révision: 4405fb0b202fdc1cd7b59c6d8348d0715b7bfd70 (tree)
• l'heure: 2020-04-20 19:43:48
• Auteur: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Message de Log

Make sleep state configurable and add a fallback

This patch allows the user to set the sleep state target from
Android properties for wakeup_count method.

It also includes a fallback state if the default state is not
available and the user didn't set the sleep.state property.

Change Summary

• modified: suspend/1.0/default/SystemSuspend.cpp
• modified: suspend/1.0/default/SystemSuspend.h

Modification

--- a/suspend/1.0/default/SystemSuspend.cpp
+++ b/suspend/1.0/default/SystemSuspend.cpp
@@ -18,6 +18,7 @@
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <google/protobuf/text_format.h>
 #include <hidl/Status.h>
@@ -31,6 +32,7 @@
 #include <string>
 #include <thread>
 
+using ::android::base::GetProperty;
 using ::android::base::ReadFdToString;
 using ::android::base::WriteStringToFd;
 using ::android::hardware::Void;
@@ -139,7 +141,7 @@ bool SystemSuspend::forceSuspend() {
     //  returns from suspend, the wakelocks and SuspendCounter will not have
     //  changed.
     auto counterLock = std::unique_lock(mCounterLock);
-    bool success = WriteStringToFd(kSleepState, mStateFd);
+    bool success = WriteStringToFd(getSleepState(), mStateFd);
     counterLock.unlock();
 
     if (!success) {
@@ -252,7 +254,7 @@ void SystemSuspend::initAutosuspend() {
                 PLOG(VERBOSE) << "error writing from /sys/power/wakeup_count";
                 continue;
             }
-            bool success = WriteStringToFd(kSleepState, mStateFd);
+            bool success = WriteStringToFd(getSleepState(), mStateFd);
             counterLock.unlock();
 
             if (!success) {
@@ -268,6 +270,25 @@ void SystemSuspend::initAutosuspend() {
     LOG(INFO) << "automatic system suspend enabled";
 }
 
+const string &SystemSuspend::getSleepState() {
+    if (mSleepState.empty()) {
+        mSleepState = GetProperty("sleep.state", "");
+        if (!mSleepState.empty()) {
+            LOG(INFO) << "autosuspend using sleep.state property " << mSleepState;
+        } else {
+            string buf = readFd(mStateFd);
+            if (buf.find(kSleepState) != std::string::npos) {
+                mSleepState = kSleepState;
+                LOG(INFO) << "autosuspend using default sleep_state " << mSleepState;
+            } else {
+                mSleepState = "freeze";
+                LOG(WARNING) << "autosuspend using fallback state " << mSleepState;
+            }
+        }
+    }
+    return mSleepState;
+}
+
 void SystemSuspend::updateSleepTime(bool success) {
     static constexpr std::chrono::milliseconds kMaxSleepTime = 1min;
     if (success) {

--- a/suspend/1.0/default/SystemSuspend.h
+++ b/suspend/1.0/default/SystemSuspend.h
@@ -82,12 +82,14 @@ class SystemSuspend : public ISystemSuspend {
 
    private:
     void initAutosuspend();
+    const std::string &getSleepState();
 
     std::mutex mCounterLock;
     std::condition_variable mCounterCondVar;
     uint32_t mSuspendCounter;
     unique_fd mWakeupCountFd;
     unique_fd mStateFd;
+    std::string mSleepState;
 
     // mStats can be inconsistent with with mSuspendCounter since we use two separate locks to
     // protect these. However, since mStats is only for debugging we prioritize performance.