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

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

Snap for 13258483 from 09ae6bf7 to 25Q4-release 

Change-Id: Ieb8218a71c6c6a91284e67f1ee8e7bc25381624c
parents 5991044e 09ae6bf7

cmds/atrace/atrace.rc

+0 −91
Original line number Diff line number Diff line
@@ -316,97 +316,6 @@ on late-init && property:ro.boot.fastboot.boottrace= 
    write /sys/kernel/debug/tracing/tracing_on 0

    write /sys/kernel/tracing/tracing_on 0



# Only create the tracing instance if persist.mm_events.enabled

# Attempting to remove the tracing instance after it has been created

# will likely fail with EBUSY as it would be in use by traced_probes.

on mm_events_property_available && property:persist.mm_events.enabled=true

# Create MM Events Tracing Instance for Kmem Activity Trigger

    mkdir /sys/kernel/debug/tracing/instances/mm_events 0755 system system

    mkdir /sys/kernel/tracing/instances/mm_events 0755 system system



# Read and set per CPU buffer size

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

    chmod 0666 /sys/kernel/tracing/instances/mm_events/buffer_size_kb



# Set the default buffer size to the minimum

    write /sys/kernel/debug/tracing/instances/mm_events/buffer_size_kb 1

    write /sys/kernel/tracing/instances/mm_events/buffer_size_kb 1



# Read and enable tracing

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/tracing_on

    chmod 0666 /sys/kernel/tracing/instances/mm_events/tracing_on



# Tracing disabled by default

    write /sys/kernel/debug/tracing/instances/mm_events/tracing_on 0

    write /sys/kernel/tracing/instances/mm_events/tracing_on 0



# Read and truncate kernel trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/trace



# Enable trace events

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/events/vmscan/mm_vmscan_direct_reclaim_begin/enable

    chmod 0666 /sys/kernel/tracing/instances/mm_events/events/vmscan/mm_vmscan_direct_reclaim_begin/enable

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/events/vmscan/mm_vmscan_kswapd_wake/enable

    chmod 0666 /sys/kernel/tracing/instances/mm_events/events/vmscan/mm_vmscan_kswapd_wake/enable

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/events/compaction/mm_compaction_begin/enable

    chmod 0666 /sys/kernel/tracing/instances/mm_events/events/compaction/mm_compaction_begin/enable



# Read and clear per-CPU raw kernel trace

# Cannot use wildcards in .rc files. Update this if there is a phone with

# more CPUs.

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu0/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu0/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu1/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu1/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu2/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu2/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu3/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu3/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu4/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu4/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu5/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu5/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu6/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu6/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu7/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu7/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu8/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu8/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu9/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu9/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu10/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu10/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu11/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu11/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu12/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu12/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu13/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu13/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu14/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu14/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu15/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu15/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu16/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu16/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu17/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu17/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu18/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu18/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu19/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu19/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu20/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu20/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu21/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu21/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu22/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu22/trace

    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu23/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu23/trace



on property:ro.persistent_properties.ready=true

    trigger mm_events_property_available



# Handle hyp tracing instance

on late-init && property:ro.boot.hypervisor.vm.supported=1

cmds/flatland/GLHelper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ bool GLHelper::createWindowSurface(uint32_t w, uint32_t h, 
    status_t err;



    if (mSurfaceComposerClient == nullptr) {

        mSurfaceComposerClient = new SurfaceComposerClient;

        mSurfaceComposerClient = sp<SurfaceComposerClient>::make();

    }

    err = mSurfaceComposerClient->initCheck();

    if (err != NO_ERROR) {

include/android/configuration.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#ifndef ANDROID_CONFIGURATION_H

#define ANDROID_CONFIGURATION_H



#include <stdint.h>

#include <sys/cdefs.h>



#include <android/asset_manager.h>

include/android/thermal.h

+20 −0
Original line number Diff line number Diff line
@@ -304,6 +304,26 @@ int AThermal_getThermalHeadroomThresholds(AThermalManager* _Nonnull manager, 
 * Prototype of the function that is called when thermal headroom or thresholds changes.

 * It's passed the updated thermal headroom and thresholds as parameters, as well as the

 * pointer provided by the client that registered a callback.

 * <p>

 * This may not be used to fully replace the {@link AThermal_getThermalHeadroom} API as it will

 * only notify on one of the conditions below that will significantly change one or both

 * values of current headroom and headroom thresholds since previous callback:

 *   1. thermal throttling events: when the skin temperature has cross any of the thresholds

 *      and there isn't a previous callback in a short time ago with similar values.

 *   2. skin temperature threshold change events: note that if the absolute °C threshold

 *      values change in a way that does not significantly change the current headroom nor

 *      headroom thresholds, it will not trigger any callback. The client should not

 *      need to take action in such case since the difference from temperature vs threshold

 *      hasn't changed.

 * <p>

 * By API version 36, it provides a forecast in the same call for developer's convenience

 * based on a {@code forecastSeconds} defined by the device, which can be static or dynamic

 * varied by OEM. Be aware that it will not notify on forecast temperature change but the

 * events mentioned above. So periodically polling against {@link AThermal_getThermalHeadroom}

 * API should still be used to actively monitor temperature forecast in advance.

 * <p>

 * This serves as a more advanced option compared to thermal status listener, where the

 * latter will only notify on thermal throttling events with status update.

 *

 * @param data The data pointer to be passed when callback is called.

 * @param headroom The current non-negative normalized headroom value, also see

include/input/InputTransport.h

+2 −0
Original line number Diff line number Diff line
@@ -454,4 +454,6 @@ private: 
    InputVerifier mInputVerifier;

};



std::ostream& operator<<(std::ostream& out, const InputMessage& msg);



} // namespace android