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

Commit 8de2fd83 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11517367 from ec3ef50f to 24Q2-release 

Change-Id: Ibc6e910b860d08dc822dc811cb67c3d3ef3126e7
parents e0e4bb34 ec3ef50f

cmds/atrace/atrace.cpp

+0 −20
Original line number Diff line number Diff line
@@ -313,12 +313,6 @@ static const char* k_traceClockPath = 
static const char* k_traceBufferSizePath =

    "buffer_size_kb";



#if 0

// TODO: Re-enable after stabilization

static const char* k_traceCmdlineSizePath =

    "saved_cmdlines_size";

#endif



static const char* k_tracingOverwriteEnablePath =

    "options/overwrite";
@@ -545,18 +539,6 @@ static bool setTraceBufferSizeKB(int size) 
    return writeStr(k_traceBufferSizePath, str);

}



#if 0

// TODO: Re-enable after stabilization

// Set the default size of cmdline hashtable

static bool setCmdlineSize()

{

    if (fileExists(k_traceCmdlineSizePath)) {

        return writeStr(k_traceCmdlineSizePath, "8192");

    }

    return true;

}

#endif



// Set the clock to the best available option while tracing. Use 'boot' if it's

// available; otherwise, use 'mono'. If neither are available use 'global'.

// Any write to the trace_clock sysfs file will reset the buffer, so only
@@ -870,8 +852,6 @@ static bool setUpKernelTracing() 
    ok &= setCategoriesEnableFromFile(g_categoriesFile);

    ok &= setTraceOverwriteEnable(g_traceOverwrite);

    ok &= setTraceBufferSizeKB(g_traceBufferSizeKB);

    // TODO: Re-enable after stabilization

    //ok &= setCmdlineSize();

    ok &= setClock();

    ok &= setPrintTgidEnableIfPresent(true);

    ok &= setKernelTraceFuncs(g_kernelTraceFuncs);

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ on late-init 
# Access control to these files is now entirely in selinux policy.

    chmod 0666 /sys/kernel/debug/tracing/trace_clock

    chmod 0666 /sys/kernel/tracing/trace_clock

    chmod 0666 /sys/kernel/debug/tracing/buffer_percent

    chmod 0666 /sys/kernel/tracing/buffer_percent

    chmod 0666 /sys/kernel/debug/tracing/buffer_size_kb

    chmod 0666 /sys/kernel/tracing/buffer_size_kb

    chmod 0666 /sys/kernel/debug/tracing/options/overwrite

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3468,7 +3468,7 @@ void Dumpstate::MaybeSnapshotUiTraces() { 
                                                  "tracing", "save-for-bugreport"});

    }



    if (!android_tracing_perfetto_protolog()) {

    if (!android_tracing_perfetto_protolog_tracing()) {

        dumpTracesForBugReportCommands.push_back({"dumpsys", "activity", "service",

                                                  "SystemUIService", "WMShell", "protolog",

                                                  "save-for-bugreport"});

include/android/input.h

+4 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,10 @@ const AInputEvent* AMotionEvent_fromJava(JNIEnv* env, jobject motionEvent) __INT 


/**

 * Creates a java android.view.InputEvent object that is a copy of the specified native

 * {@link AInputEvent}. Returns null on error

 * {@link AInputEvent}.

 *

 * Specified {@link AInputEvent} is require to be a valid {@link MotionEvent} or {@link KeyEvent}

 * object.

 *

 *  Available since API level 35.

 */

libs/graphicsenv/GraphicsEnv.cpp

+4 −2
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ android_namespace_t* GraphicsEnv::getDriverNamespace() { 


    auto vndkNamespace = android_get_exported_namespace("vndk");

    if (!vndkNamespace) {

        return nullptr;

        mDriverNamespace = nullptr;

        return mDriverNamespace;

    }



    mDriverNamespace = android_create_namespace("updatable gfx driver",
@@ -617,7 +618,8 @@ android_namespace_t* GraphicsEnv::getAngleNamespace() { 


    auto vndkNamespace = android_get_exported_namespace("vndk");

    if (!vndkNamespace) {

        return nullptr;

        mAngleNamespace = nullptr;

        return mAngleNamespace;

    }



    if (!linkDriverNamespaceLocked(mAngleNamespace, vndkNamespace, "")) {