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

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

Snap for 11789350 from 960f1a6b to 24Q3-release 

Change-Id: Ibadeb94cdc3f932c649d2ec4eaa87a5ce5d84575
parents 3c3bc9f1 960f1a6b

cmds/dumpstate/Android.bp

+4 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,10 @@ filegroup { 




cc_defaults {

cc_defaults {

    name: "dumpstate_defaults",

    name: "dumpstate_defaults",

    defaults: ["dumpstate_cflag_defaults"],

    defaults: [

        "aconfig_lib_cc_static_link.defaults",

        "dumpstate_cflag_defaults",

    ],

    shared_libs: [

    shared_libs: [

        "android.hardware.dumpstate@1.0",

        "android.hardware.dumpstate@1.0",

        "android.hardware.dumpstate@1.1",

        "android.hardware.dumpstate@1.1",

libs/binder/liblog_stub/include/log/log.h

+10 −10
Original line number Original line Diff line number Diff line
@@ -60,8 +60,8 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...) 
            std::fprintf(stderr, fmt __VA_OPT__(, ) __VA_ARGS__);            \

            std::fprintf(stderr, fmt __VA_OPT__(, ) __VA_ARGS__);            \

        }                                                                    \

        }                                                                    \

        IF_ALOG(priority, tag) {                                             \

        IF_ALOG(priority, tag) {                                             \

            __android_log_print(ANDROID_##priority, tag,                       \

            __android_log_print(ANDROID_##priority, tag, "%s: " fmt "\n",    \

                                tag ": " fmt "\n" __VA_OPT__(, ) __VA_ARGS__); \

                                (tag)__VA_OPT__(, ) __VA_ARGS__);            \

        }                                                                    \

        }                                                                    \

        if constexpr (ANDROID_##priority == ANDROID_LOG_FATAL) std::abort(); \

        if constexpr (ANDROID_##priority == ANDROID_LOG_FATAL) std::abort(); \

    } while (false)

    } while (false)

libs/binder/tests/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -200,9 +200,11 @@ cc_library_static { 
    defaults: [

    defaults: [

        "binder_test_defaults",

        "binder_test_defaults",

    ],

    ],

    header_libs: [

        "libbinder_headers_base",

    ],

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "liblog",

    ],

    ],

    srcs: [

    srcs: [

        "FileUtils.cpp",

        "FileUtils.cpp",

libs/input/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -249,7 +249,6 @@ cc_library { 
        "libcutils",

        "libcutils",

        "liblog",

        "liblog",

        "libPlatformProperties",

        "libPlatformProperties",

        "libstatslog",

        "libtinyxml2",

        "libtinyxml2",

        "libutils",

        "libutils",

        "libz", // needed by libkernelconfigs

        "libz", // needed by libkernelconfigs

libs/input/MotionPredictorMetricsManager.cpp

+3 −13
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <algorithm>

#include <algorithm>





#include <android-base/logging.h>

#include <android-base/logging.h>

#include <statslog.h>





#include "Eigen/Core"

#include "Eigen/Core"

#include "Eigen/Geometry"

#include "Eigen/Geometry"
@@ -45,18 +44,9 @@ inline constexpr float PATH_LENGTH_EPSILON = 0.001; 




void MotionPredictorMetricsManager::defaultReportAtomFunction(

void MotionPredictorMetricsManager::defaultReportAtomFunction(

        const MotionPredictorMetricsManager::AtomFields& atomFields) {

        const MotionPredictorMetricsManager::AtomFields& atomFields) {

    android::util::stats_write(android::util::STYLUS_PREDICTION_METRICS_REPORTED,

    // TODO(b/338106546): Fix bootanimation build dependency issue, then re-add

                               /*stylus_vendor_id=*/0,

    // the stats_write function call here.

                               /*stylus_product_id=*/0,

    (void)atomFields;

                               atomFields.deltaTimeBucketMilliseconds,

                               atomFields.alongTrajectoryErrorMeanMillipixels,

                               atomFields.alongTrajectoryErrorStdMillipixels,

                               atomFields.offTrajectoryRmseMillipixels,

                               atomFields.pressureRmseMilliunits,

                               atomFields.highVelocityAlongTrajectoryRmse,

                               atomFields.highVelocityOffTrajectoryRmse,

                               atomFields.scaleInvariantAlongTrajectoryRmse,

                               atomFields.scaleInvariantOffTrajectoryRmse);

}

}





MotionPredictorMetricsManager::MotionPredictorMetricsManager(

MotionPredictorMetricsManager::MotionPredictorMetricsManager(