From 521d15c537b410c62cbe0e65c37c6a902f056a81 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 1 May 2018 16:26:21 -0700 Subject: [PATCH] Make dumpstate HAL lazy. Bug: 78509314 Test: HAL isn't running Test: adb bugreport HAL runs Test: HAL isn't running after bugreport finishes Test: manually inspect state using `lshal` and logs using `adb logcat | grep android.hardware.dump` (cherry picked from commit 711b806727c85d91cf805db4f78b4a9609e2bf43) Change-Id: Ic97516a4297e7933430fb4fa3fd0109f8c1b1d0a --- dumpstate/1.0/default/DumpstateDevice.cpp | 6 ++++++ .../1.0/default/android.hardware.dumpstate@1.0-service.rc | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dumpstate/1.0/default/DumpstateDevice.cpp b/dumpstate/1.0/default/DumpstateDevice.cpp index 818a53127c..88623afd7f 100644 --- a/dumpstate/1.0/default/DumpstateDevice.cpp +++ b/dumpstate/1.0/default/DumpstateDevice.cpp @@ -18,6 +18,7 @@ #include "DumpstateDevice.h" +#include #include #include "DumpstateUtil.h" @@ -37,6 +38,11 @@ Return DumpstateDevice::dumpstateBoard(const hidl_handle& handle) { // this interface - since HIDL_FETCH_IDumpstateDevice() is not defined, this function will never // be called by dumpstate. + // Exit when dump is completed since this is a lazy HAL. + addPostCommandTask([]() { + exit(0); + }); + if (handle == nullptr || handle->numFds < 1) { ALOGE("no FDs\n"); return Void(); diff --git a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc index adc6cda116..dfbfb33553 100644 --- a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc +++ b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc @@ -3,3 +3,5 @@ service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service user system group system interface android.hardware.dumpstate@1.0::IDumpstateDevice default + oneshot + disabled