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

Commit 0a965ef6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11908474 from 7f9f91a6 to 24Q3-release 

Change-Id: I0d171f735039280f126b247fa22e753209d807c7
parents c4bf335b 7f9f91a6

cmds/dumpstate/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ 
    },

    {

      "name": "dumpstate_test"

    },

    {

        "name": "CtsSecurityHostTestCases",

        "options": [

            {

                "include-filter": "android.security.cts.SELinuxHostTest#testNoBugreportDenials"

            }

        ]

    }

  ],

  "postsubmit": [

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));

include/binder/Common.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../libs/binder/include/binder/Common.h
 
 No newline at end of file

libs/binder/BufferedTextOutput.h

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
// ---------------------------------------------------------------------------

namespace android {



class BufferedTextOutput : public TextOutput

{

class LIBBINDER_INTERNAL_EXPORTED BufferedTextOutput : public TextOutput {

public:

    //** Flags for constructor */

    enum {

libs/binder/Debug.h

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <sys/types.h>

#include <string>



#include <binder/Common.h>



namespace android {

// ---------------------------------------------------------------------------
@@ -35,7 +37,8 @@ void printHexData(int32_t indent, const void *buf, size_t length, 
    size_t alignment=0, bool cArrayStyle=false,

    debugPrintFunc func = nullptr, void* cookie = nullptr);



extern "C" ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);

// Used by libmemunreachable.

extern "C" LIBBINDER_EXPORTED ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);



// ---------------------------------------------------------------------------

} // namespace android