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

Commit 7f9f91a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Dump UWB snoop logs into bugreport" into main am: afbfd4c2 am: b56f5510 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3088266



Change-Id: Id98ce9c2c0747e25b9137215d8917bef286f6868
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3404d1ff b56f5510

cmds/dumpstate/dumpstate.cpp

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ void add_mountinfo(); 
#define SDK_EXT_INFO "/apex/com.android.sdkext/bin/derive_sdk"

#define DROPBOX_DIR "/data/system/dropbox"

#define PRINT_FLAGS "/system/bin/printflags"

#define UWB_LOG_DIR "/data/misc/apexdata/com.android.uwb/log"



// TODO(narayan): Since this information has to be kept in sync

// with tombstoned, we should just put it in a common header.
@@ -1972,6 +1973,9 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { 
    RunCommand("SDK EXTENSIONS", {SDK_EXT_INFO, "--dump"},

               CommandOptions::WithTimeout(10).Always().DropRoot().Build());



    // Dump UWB UCI logs here because apexdata requires root access

    ds.AddDir(UWB_LOG_DIR, true);



    if (dump_pool_) {

        RETURN_IF_USER_DENIED_CONSENT();

        WaitForTask(std::move(dump_traces));