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

Commit 53cf65aa authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9891612 from c65d2ad2 to udc-release 

Change-Id: I5a8cffd4143cf6d4ded47c18dbd8d04224c5b720
parents 7e13f643 c65d2ad2

cmds/atrace/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ cc_binary { 
    ],



    init_rc: ["atrace.rc"],

    required: ["ftrace_synthetic_events.conf"],



    product_variables: {

        debuggable: {
@@ -45,3 +46,8 @@ cc_binary { 
        },

    },

}



prebuilt_etc {

    name: "ftrace_synthetic_events.conf",

    src: "ftrace_synthetic_events.conf",

}

cmds/atrace/atrace.rc

+11 −5
Original line number Diff line number Diff line
@@ -291,12 +291,10 @@ on late-init 
# Setup synthetic events

    chmod 0666 /sys/kernel/tracing/synthetic_events

    chmod 0666 /sys/kernel/debug/tracing/synthetic_events

    copy /system/etc/ftrace_synthetic_events.conf /sys/kernel/tracing/synthetic_events

    copy /system/etc/ftrace_synthetic_events.conf /sys/kernel/debug/tracing/synthetic_events



    # rss_stat_throttled

    write /sys/kernel/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size"

    write /sys/kernel/debug/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size"



    # allow creating event triggers

    # allow creating rss_stat event triggers

    chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/trigger

    chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger
@@ -304,6 +302,14 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/synthetic/rss_stat_throttled/enable

    chmod 0666 /sys/kernel/debug/tracing/events/synthetic/rss_stat_throttled/enable



    # allow creating suspend_resume triggers

    chmod 0666 /sys/kernel/tracing/events/power/suspend_resume/trigger

    chmod 0666 /sys/kernel/debug/tracing/events/power/suspend_resume/trigger



    # allow enabling suspend_resume_minimal

    chmod 0666 /sys/kernel/tracing/events/synthetic/suspend_resume_minimal/enable

    chmod 0666 /sys/kernel/debug/tracing/events/synthetic/suspend_resume_minimal/enable



on late-init && property:ro.boot.fastboot.boottrace=enabled

    setprop debug.atrace.tags.enableflags 802922

    setprop persist.traced.enable 0

cmds/atrace/ftrace_synthetic_events.conf

0 → 100644
+2 −0
Original line number Diff line number Diff line 
rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size

suspend_resume_minimal bool start

cmds/dumpstate/dumpstate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2236,8 +2236,7 @@ Dumpstate::RunStatus Dumpstate::DumpTraces(const char** path) { 


        const uint64_t start = Nanotime();

        const int ret = dump_backtrace_to_file_timeout(

            pid, is_java_process ? kDebuggerdJavaBacktrace : kDebuggerdNativeBacktrace,

            is_java_process ? 5 : 20, fd);

            pid, is_java_process ? kDebuggerdJavaBacktrace : kDebuggerdNativeBacktrace, 3, fd);



        if (ret == -1) {

            // For consistency, the header and footer to this message match those
@@ -2816,6 +2815,7 @@ static void SetOptionsFromMode(Dumpstate::BugreportMode mode, Dumpstate::DumpOpt 
            options->do_screenshot = false;

            break;

        case Dumpstate::BugreportMode::BUGREPORT_WEAR:

            options->do_vibrate = false;

            options->do_progress_updates = true;

            options->do_screenshot = is_screenshot_requested;

            break;

cmds/dumpstate/tests/dumpstate_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -286,8 +286,8 @@ TEST_F(DumpOptionsTest, InitializeWearBugReport) { 




    // Other options retain default values

    EXPECT_TRUE(options_.do_vibrate);

    EXPECT_FALSE(options_.progress_updates_to_socket);

    EXPECT_FALSE(options_.do_vibrate);

    EXPECT_FALSE(options_.show_header_only);

    EXPECT_FALSE(options_.is_remote_mode);

    EXPECT_FALSE(options_.stream_to_socket);