Merge "create an empty dump for wlan"

device.mk

@@ -24,6 +24,8 @@ include device/google/gs-common/trusty/trusty.mk
 include device/google/gs-common/storage/storage.mk
 include device/google/gs-common/thermal/thermal.mk
 
+include device/google/zuma/dumpstate/item.mk
+
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 include device/google/gs-common/gps/brcm/device.mk
 endif

dumpstate/Android.bp

@@ -2,6 +2,13 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+sh_binary {
+    name: "dump_wlan.sh",
+    src: "dump_wlan.sh",
+    vendor: true,
+    sub_dir: "dump",
+}
+
 cc_binary {
     name: "android.hardware.dumpstate-service.zuma",
     srcs: [

dumpstate/Dumpstate.cpp

@@ -221,7 +221,6 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
 
 Dumpstate::Dumpstate()
   : mTextSections{
-        { "wlan", [this](int fd) { dumpWlanSection(fd); } },
         { "memory", [this](int fd) { dumpMemorySection(fd); } },
         { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
         { "power", [this](int fd) { dumpPowerSection(fd); } },
@@ -296,15 +295,6 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
                                    "not avalable from the command line.\n", fd);
 }
 
-// Dump items related to wlan
-void Dumpstate::dumpWlanSection(int fd) {
-    RunCommandToFd(fd, "WLAN Debug Dump", {"/vendor/bin/sh", "-c",
-                   "cat /sys/wifi/dump_start"});
-
-    // Dump firmware symbol table for firmware log decryption
-    DumpFileToFd(fd, "WLAN FW Log Symbol Table", "/vendor/firmware/Data.msc");
-}
-
 // Dump items related to power and battery
 void Dumpstate::dumpPowerSection(int fd) {
     struct stat buffer;

dumpstate/Dumpstate.h

@@ -52,7 +52,6 @@ class Dumpstate : public BnDumpstateDevice {
 
     // Text sections that can be dumped individually on the command line in
     // addition to being included in full dumps
-    void dumpWlanSection(int fd);
     void dumpPowerSection(int fd);
     void dumpDevfreqSection(int fd);
     void dumpMemorySection(int fd);

dumpstate/dump_wlan.sh

@@ -0,0 +1,3 @@
+#!/vendor/bin/sh
+echo "--- wlan WIP ---"
+

dumpstate/item.mk

@@ -0,0 +1 @@
+PRODUCT_PACKAGES += dump_wlan.sh