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

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

Snap for 11526283 from 8bf4487a to 24Q2-release

Change-Id: I940aea175b301229dcf5fa0d4ad4be58eb1dfc50
parents 0c7d73d4 8bf4487a
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -34,7 +34,13 @@ license {

cc_library_headers {
    name: "libnativedisplay_headers",
    host_supported: true,
    export_include_dirs: ["include"],
    target: {
        windows: {
            enabled: true,
        },
    },
}

cc_library_shared {
+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ cc_library_headers {
        "test_com.android.media.swcodec",
    ],
    host_supported: true,
    target: {
        windows: {
            enabled: true,
        },
    },
}

ndk_library {
+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@
#include <inttypes.h>
#include <sys/cdefs.h>

#if !defined(__INTRODUCED_IN)
#define __INTRODUCED_IN(__api_level) /* nothing */
#endif

__BEGIN_DECLS

// clang-format off
+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ enum {
    BATTERY_PROP_CAPACITY = 4, // equals BATTERY_PROPERTY_CAPACITY
    BATTERY_PROP_ENERGY_COUNTER = 5, // equals BATTERY_PROPERTY_ENERGY_COUNTER
    BATTERY_PROP_BATTERY_STATUS = 6, // equals BATTERY_PROPERTY_BATTERY_STATUS
    BATTERY_PROP_CHARGING_POLICY = 7, // equals BATTERY_PROPERTY_CHARGING_POLICY
    BATTERY_PROP_MANUFACTURING_DATE = 8, // equals BATTERY_PROPERTY_MANUFACTURING_DATE
    BATTERY_PROP_FIRST_USAGE_DATE = 9, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE
    BATTERY_PROP_MANUFACTURING_DATE = 7, // equals BATTERY_PROPERTY_MANUFACTURING_DATE
    BATTERY_PROP_FIRST_USAGE_DATE = 8, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE
    BATTERY_PROP_CHARGING_POLICY = 9, // equals BATTERY_PROPERTY_CHARGING_POLICY
    BATTERY_PROP_STATE_OF_HEALTH = 10, // equals BATTERY_PROPERTY_STATE_OF_HEALTH
    BATTERY_PROP_PART_STATUS = 12, // equals BATTERY_PROPERTY_PART_STATUS
};
+2 −2
Original line number Diff line number Diff line
@@ -2558,9 +2558,9 @@ std::vector<InputTarget> InputDispatcher::findTouchedWindowTargetsLocked(
                return {};
            }

            // Drop touch events if requested by input feature
            // Do not slide events to the window which can not receive motion event
            if (newTouchedWindowHandle != nullptr &&
                shouldDropInput(entry, newTouchedWindowHandle)) {
                !canWindowReceiveMotionLocked(newTouchedWindowHandle, entry)) {
                newTouchedWindowHandle = nullptr;
            }

Loading