Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d5c237b authored by Wei Liu's avatar Wei Liu
Browse files

Merge commit '51f1241e' into manual_merge_51f1241 

Change-Id: Ic280f17d715f981a980929c49c65097f245afcb8
parents 7cafe25f 51f1241e

cmds/dumpstate/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := dumpstate.cpp utils.cpp 


LOCAL_MODULE := dumpstate



LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase

LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase libhardware_legacy

# ZipArchive support, the order matters here to get all symbols.

LOCAL_STATIC_LIBRARIES := libziparchive libz libcrypto_static

LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

cmds/dumpstate/dumpstate.cpp

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <android-base/unique_fd.h>

#include <android-base/file.h>

#include <cutils/properties.h>

#include <hardware_legacy/power.h>



#include "private/android_filesystem_config.h"
@@ -83,6 +84,7 @@ static bool dry_run = false; 
#define TOMBSTONE_MAX_LEN (sizeof(TOMBSTONE_FILE_PREFIX) + 4)

#define NUM_TOMBSTONES  10

#define WLUTIL "/vendor/xbin/wlutil"

#define WAKE_LOCK_NAME "dumpstate_wakelock"



typedef struct {

  char name[TOMBSTONE_MAX_LEN];
@@ -1272,6 +1274,10 @@ static std::string SHA256_file_hash(std::string filepath) { 
    return std::string(hash_buffer);

}



static void wake_lock_releaser() {

    release_wake_lock(WAKE_LOCK_NAME);

}



int main(int argc, char *argv[]) {

    struct sigaction sigact;

    int do_add_date = 0;
@@ -1290,6 +1296,9 @@ int main(int argc, char *argv[]) { 


    MYLOGI("begin\n");



    acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME);

    atexit(wake_lock_releaser);



    dry_run = property_get_bool("dumpstate.dry_run", 0) != 0;

    if (is_dry_run()) {

        MYLOGI("Running on dry-run mode (to disable it, call 'setprop dumpstate.dry_run false')\n");