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

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

Snap for 4437123 from 9ebab104 to pi-release 

Change-Id: Ib57f37b1846a25bd3d7c01a9e927591ff57cbb43
parents d5dbd5e6 9ebab104

cmds/atrace/atrace.cpp

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ static const TracingCategory k_categories[] = { 
    { "freq",       "CPU Frequency",    0, {

        { REQ,      "events/power/cpu_frequency/enable" },

        { OPT,      "events/power/clock_set_rate/enable" },

        { OPT,      "events/power/clock_disable/enable" },

        { OPT,      "events/power/clock_enable/enable" },

        { OPT,      "events/power/cpu_frequency_limits/enable" },

    } },

    { "membus",     "Memory Bus Utilization", 0, {

cmds/dumpstate/dumpstate.cpp

+2 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ void Dumpstate::PrintHeader() const { 
    printf("Kernel: ");

    DumpFileToFd(STDOUT_FILENO, "", "/proc/version");

    printf("Command line: %s\n", strtok(cmdline_buf, "\n"));

    ds.RunCommand("UPTIME", {"uptime"}, CommandOptions::DEFAULT);

    printf("Bugreport format version: %s\n", version_.c_str());

    printf("Dumpstate info: id=%d pid=%d dry_run=%d args=%s extra_options=%s\n", id_, pid_,

           PropertiesHelper::IsDryRun(), args_.c_str(), extra_options_.c_str());
@@ -1092,6 +1093,7 @@ static void dumpstate() { 
    DurationReporter duration_reporter("DUMPSTATE");



    dump_dev_files("TRUSTY VERSION", "/sys/bus/platform/drivers/trusty", "trusty_version");

    /* TODO: Remove duplicate uptime call when tools use it from header */

    RunCommand("UPTIME", {"uptime"});

    DumpBlockStatFiles();

    dump_emmc_ecsd("/d/mmc0/mmc0:0001/ext_csd");

libs/vr/libdvr/include/dvr/dvr_display_types.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ __BEGIN_DECLS 
#ifndef __FLOAT32X4T_86

#define __FLOAT32X4T_86

typedef float float32x4_t __attribute__((__vector_size__(16)));

typedef struct float32x4x4_t { float32x4_t val[4]; };

typedef struct float32x4x4_t { float32x4_t val[4]; } float32x4x4_t;

#endif

#endif

services/sensorservice/BatteryService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -78,12 +78,13 @@ void BatteryService::cleanupImpl(uid_t uid) { 
    if (checkService()) {

        Mutex::Autolock _l(mActivationsLock);

        int64_t identity = IPCThreadState::self()->clearCallingIdentity();

        for (size_t i=0 ; i<mActivations.size() ; i++) {

        for (size_t i=0 ; i<mActivations.size() ; ) {

            const Info& info(mActivations[i]);

            if (info.uid == uid) {

                mBatteryStatService->noteStopSensor(info.uid, info.handle);

                mActivations.removeAt(i);

                i--;

            } else {

              i++;

            }

        }

        IPCThreadState::self()->restoreCallingIdentity(identity);
@@ -105,4 +106,3 @@ ANDROID_SINGLETON_STATIC_INSTANCE(BatteryService) 


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

}; // namespace android

services/surfaceflinger/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ LOCAL_SRC_FILES := \ 
    MonitoredProducer.cpp \

    SurfaceFlingerConsumer.cpp \

    SurfaceInterceptor.cpp \

    SurfaceTracing.cpp \

    Transform.cpp \

    DisplayHardware/ComposerHal.cpp \

    DisplayHardware/FramebufferSurface.cpp \