commit 34ed38743ee3d03886d5990330242e6f9367129c
author Dmitry Shmidt <dimitrysh@google.com> Mon Oct 07 12:43:36 2019 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Mon Oct 07 16:33:06 2019 -0700
tree de62980957131c7738aff9ba168bc2b40e752bfc
parent 772fb53999dbba193b8333eb51812cb1a19bd74a

light: Allow blank_screen utiltiy to get color from command line

Bug: 142058809
Test: blank_screen 0xFFFFFFFF

Change-Id: I4efdaaa2397b076e5699a75852bb15bfb1f6c5f8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

light/utils/main.cpp

diff --git a/light/utils/main.cpp b/light/utils/main.cpp
index d07e799..b834132 100644
--- a/light/utils/main.cpp
+++ b/light/utils/main.cpp
@@ -25,7 +25,7 @@
     std::cerr << msg << std::endl;
 }
 
-int main() {
+int main(int argc, char* argv[]) {
     using ::android::hardware::hidl_vec;
     using ::android::hardware::light::V2_0::Brightness;
     using ::android::hardware::light::V2_0::Flash;
@@ -41,10 +41,29 @@
         return -1;
     }
 
-    const static LightState off = {
-        .color = 0u, .flashMode = Flash::NONE, .brightnessMode = Brightness::USER,
+    static LightState off = {
+            .color = 0u,
+            .flashMode = Flash::NONE,
+            .brightnessMode = Brightness::USER,
     };
 
+    if (argc > 2) {
+        error("Usage: blank_screen [color]");
+        return -1;
+    }
+
+    if (argc > 1) {
+        char* col_ptr;
+        unsigned int col_new;
+
+        col_new = strtoul(argv[1], &col_ptr, 0);
+        if (*col_ptr != '\0') {
+            error("Failed to convert " + std::string(argv[1]) + " to number");
+            return -1;
+        }
+        off.color = col_new;
+    }
+
     service->getSupportedTypes([&](const hidl_vec<Type>& types) {
         for (Type type : types) {
             Status ret = service->setLight(type, off);