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

Commit a73d0e41 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5546586 from 14eda77e to qt-release 

Change-Id: Iab871c10230b2c4181a01f5a397f44f5372f3e27
parents e1e49d90 14eda77e

cmds/atrace/atrace.cpp

+5 −5
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ using hardware::atrace::V1_0::toString; 


using std::string;



#define MAX_SYS_FILES 10

#define MAX_SYS_FILES 11



const char* k_traceTagsProperty = "debug.atrace.tags.enableflags";

const char* k_userInitiatedTraceProperty = "debug.atrace.user_initiated";
@@ -133,7 +133,11 @@ static const TracingCategory k_categories[] = { 
        { OPT,      "events/sched/sched_blocked_reason/enable" },

        { OPT,      "events/sched/sched_cpu_hotplug/enable" },

        { OPT,      "events/sched/sched_pi_setprio/enable" },

        { OPT,      "events/sched/sched_process_exit/enable" },

        { OPT,      "events/cgroup/enable" },

        { OPT,      "events/oom/oom_score_adj_update/enable" },

        { OPT,      "events/task/task_rename/enable" },

        { OPT,      "events/task/task_newtask/enable" },

    } },

    { "irq",        "IRQ Events",   0, {

        { REQ,      "events/irq/enable" },
@@ -231,10 +235,6 @@ static const TracingCategory k_categories[] = { 
        { OPT,      "events/kmem/rss_stat/enable" },

        { OPT,      "events/kmem/ion_heap_grow/enable" },

        { OPT,      "events/kmem/ion_heap_shrink/enable" },

        { OPT,      "events/oom/oom_score_adj_update/enable" },

        { OPT,      "events/sched/sched_process_exit/enable" },

        { OPT,      "events/task/task_rename/enable" },

        { OPT,      "events/task/task_newtask/enable" },

    } },

};

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable

    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_pi_setprio/enable

    chmod 0666 /sys/kernel/tracing/events/sched/sched_pi_setprio/enable

    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_process_exit/enable

    chmod 0666 /sys/kernel/tracing/events/sched/sched_process_exit/enable

    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_waking/enable

    chmod 0666 /sys/kernel/tracing/events/sched/sched_waking/enable

    chmod 0666 /sys/kernel/debug/tracing/events/cgroup/enable

headers/media_plugin/media/drm/DrmAPI.h

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ namespace android { 
            kKeyStatusType_Expired,

            kKeyStatusType_OutputNotAllowed,

            kKeyStatusType_StatusPending,

            kKeyStatusType_InternalError

            kKeyStatusType_InternalError,

            kKeyStatusType_UsableInFuture

        };



        // Used by sendKeysChange to report the usability status of each

libs/graphicsenv/GpuStatsInfo.cpp

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ status_t GpuStatsGlobalInfo::writeToParcel(Parcel* parcel) const { 
    if ((status = parcel->writeInt32(vkLoadingCount)) != OK) return status;

    if ((status = parcel->writeInt32(vkLoadingFailureCount)) != OK) return status;

    if ((status = parcel->writeInt32(vulkanVersion)) != OK) return status;

    if ((status = parcel->writeInt32(cpuVulkanVersion)) != OK) return status;

    if ((status = parcel->writeInt32(glesVersion)) != OK) return status;

    return OK;

}
@@ -49,6 +51,8 @@ status_t GpuStatsGlobalInfo::readFromParcel(const Parcel* parcel) { 
    if ((status = parcel->readInt32(&vkLoadingCount)) != OK) return status;

    if ((status = parcel->readInt32(&vkLoadingFailureCount)) != OK) return status;

    if ((status = parcel->readInt32(&vulkanVersion)) != OK) return status;

    if ((status = parcel->readInt32(&cpuVulkanVersion)) != OK) return status;

    if ((status = parcel->readInt32(&glesVersion)) != OK) return status;

    return OK;

}
@@ -63,6 +67,8 @@ std::string GpuStatsGlobalInfo::toString() const { 
    StringAppendF(&result, "vkLoadingCount = %d\n", vkLoadingCount);

    StringAppendF(&result, "vkLoadingFailureCount = %d\n", vkLoadingFailureCount);

    StringAppendF(&result, "vulkanVersion = %d\n", vulkanVersion);

    StringAppendF(&result, "cpuVulkanVersion = %d\n", cpuVulkanVersion);

    StringAppendF(&result, "glesVersion = %d\n", glesVersion);

    return result;

}

libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ public: 
    int32_t vkLoadingCount = 0;

    int32_t vkLoadingFailureCount = 0;

    int32_t vulkanVersion = 0;

    int32_t cpuVulkanVersion = 0;

    int32_t glesVersion = 0;

};



/*