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

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

Snap for 11679388 from ab6300a9 to 24Q3-release 

Change-Id: I25ca46a83ae9f045d598fa78c90b95fd178c882d
parents f8db0e29 ab6300a9

libs/binder/ndk/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ cc_library { 
    ],



    cflags: [

        "-DBINDER_WITH_KERNEL_IPC",

        "-Wall",

        "-Wextra",

        "-Werror",

libs/binder/ndk/ibinder.cpp

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <private/android_filesystem_config.h>

#endif



#include "../BuildFlags.h"

#include "ibinder_internal.h"

#include "parcel_internal.h"

#include "status_internal.h"
@@ -211,6 +212,12 @@ status_t ABBinder::onTransact(transaction_code_t code, const Parcel& data, Parce 
        binder_status_t status = getClass()->onTransact(this, code, &in, &out);

        return PruneStatusT(status);

    } else if (code == SHELL_COMMAND_TRANSACTION && getClass()->handleShellCommand != nullptr) {

        if constexpr (!android::kEnableKernelIpc) {

            // Non-IPC builds do not have getCallingUid(),

            // so we have no way of authenticating the caller

            return STATUS_PERMISSION_DENIED;

        }



        int in = data.readFileDescriptor();

        int out = data.readFileDescriptor();

        int err = data.readFileDescriptor();

libs/nativewindow/rust/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ rust_bindgen { 
    },

    min_sdk_version: "VanillaIceCream",

    vendor_available: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.virt",

    ],

}



rust_library {
@@ -78,6 +82,10 @@ rust_library { 
    },

    min_sdk_version: "VanillaIceCream",

    vendor_available: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.virt",

    ],

}



rust_test {
@@ -116,6 +124,10 @@ rust_library { 
    },

    min_sdk_version: "VanillaIceCream",

    vendor_available: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.virt",

    ],

}



rust_test {

libs/nativewindow/rust/src/lib.rs

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


extern crate nativewindow_bindgen as ffi;



pub mod surface;

mod surface;

pub use surface::Surface;



pub use ffi::{AHardwareBuffer_Format, AHardwareBuffer_UsageFlags};

services/inputflinger/dispatcher/InputState.cpp

+2 −3
Original line number Diff line number Diff line
@@ -338,9 +338,8 @@ bool InputState::shouldCancelPreviousStream(const MotionEntry& motionEntry) cons 
        // it's unlikely that those two streams would be consistent with each other. Therefore,

        // cancel the previous gesture if the display id changes.

        if (motionEntry.displayId != lastMemento.displayId) {

            LOG(INFO) << "Canceling stream: last displayId was "

                      << inputEventSourceToString(lastMemento.displayId) << " and new event is "

                      << motionEntry;

            LOG(INFO) << "Canceling stream: last displayId was " << lastMemento.displayId

                      << " and new event is " << motionEntry;

            return true;

        }