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

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

Snap for 11565217 from 56bd023e to 24Q3-release 

Change-Id: Iaa8cc5ba735ad234ba8c3b756fc1745d5d97ae39
parents 41d26121 56bd023e

libs/binder/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ cc_defaults { 
                "UtilsHost.cpp",

            ],

        },

        android: {

            lto: {

                 thin: true,

            },

        },

    },



    aidl: {
@@ -219,9 +224,6 @@ cc_defaults { 
        "-performance-move-const-arg", // b/273486801

        "portability*",

    ],

    lto: {

        thin: true,

    },

}



cc_library_headers {

libs/binder/Parcel.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2980,6 +2980,7 @@ status_t Parcel::restartWrite(size_t desired) 


    uint8_t* data = reallocZeroFree(mData, mDataCapacity, desired, mDeallocZero);

    if (!data && desired > mDataCapacity) {

        LOG_ALWAYS_FATAL("out of memory");

        mError = NO_MEMORY;

        return NO_MEMORY;

    }

libs/input/Android.bp

+24 −12
Original line number Diff line number Diff line
@@ -135,6 +135,29 @@ rust_bindgen { 
    ],

}



cc_library_static {

    name: "iinputflinger_aidl_lib_static",

    host_supported: true,

    srcs: [

        "android/os/IInputFlinger.aidl",

        "android/os/InputChannelCore.aidl",

    ],

    shared_libs: [

        "libbinder",

    ],

    whole_static_libs: [

        "libgui_window_info_static",

    ],

    aidl: {

        export_aidl_headers: true,

        local_include_dirs: ["."],

        include_dirs: [

            "frameworks/native/libs/gui",

            "frameworks/native/libs/input",

        ],

    },

}



// Contains methods to help access C++ code from rust

cc_library_static {

    name: "libinput_from_rust_to_cpp",
@@ -179,8 +202,6 @@ cc_library { 
        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

    ],

    srcs: [

        "android/os/IInputFlinger.aidl",

        "android/os/InputChannelCore.aidl",

        "AccelerationCurve.cpp",

        "Input.cpp",

        "InputDevice.cpp",
@@ -243,7 +264,6 @@ cc_library { 


    static_libs: [

        "inputconstants-cpp",

        "libgui_window_info_static",

        "libui-types",

        "libtflite_static",

        "libkernelconfigs",
@@ -252,10 +272,10 @@ cc_library { 
    whole_static_libs: [

        "com.android.input.flags-aconfig-cc",

        "libinput_rust_ffi",

        "iinputflinger_aidl_lib_static",

    ],



    export_static_lib_headers: [

        "libgui_window_info_static",

        "libui-types",

    ],
@@ -289,14 +309,6 @@ cc_library { 
            ],

        },

    },



    aidl: {

        local_include_dirs: ["."],

        export_aidl_headers: true,

        include_dirs: [

            "frameworks/native/libs/gui",

        ],

    },

}



// Use bootstrap version of stats logging library.

libs/input/Input.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,8 @@ std::tuple<int32_t, std::vector<PointerProperties>, std::vector<PointerCoords>> 
                        (splitPointerProperties.size() * (historySize + 1)));



    if (CC_UNLIKELY(splitPointerProperties.size() != splitCount)) {

        LOG(FATAL) << "Cannot split MotionEvent: Requested splitting " << splitCount

        // TODO(b/329107108): Promote this to a fatal check once bugs in the caller are resolved.

        LOG(ERROR) << "Cannot split MotionEvent: Requested splitting " << splitCount

                   << " pointers from the original event, but the original event only contained "

                   << splitPointerProperties.size() << " of those pointers.";

    }