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

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

Snap for 11336776 from 0ef096d7 to 24Q2-release

Change-Id: I53a6666dbaea65841c992d71ab2c220d7fab984f
parents cae2c147 0ef096d7
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -63,13 +63,6 @@ flag {
  bug: "301055381"
}

flag {
  name: "remove_app_switch_drops"
  namespace: "input"
  description: "Remove the logic of dropping events due to pending app switch"
  bug: "284808102"
}

flag {
  name: "disable_reject_touch_on_stylus_hover"
  namespace: "input"
+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@
#define ANDROID_DATA_SPACE_H

#include <inttypes.h>
#include <stdint.h>

#include <sys/cdefs.h>

+0 −7
Original line number Diff line number Diff line
@@ -97,13 +97,6 @@ const bool DEBUG_TOUCH_MODE =
 */
constexpr bool DEBUG_TOUCH_OCCLUSION = true;

/**
 * Log debug messages about the app switch latency optimization.
 * Enable this via "adb shell setprop log.tag.InputDispatcherAppSwitch DEBUG" (requires restart)
 */
const bool DEBUG_APP_SWITCH =
        android::base::ShouldLog(android::base::LogSeverity::DEBUG, LOG_TAG "AppSwitch");

/**
 * Log debug messages about hover events.
 * Enable this via "adb shell setprop log.tag.InputDispatcherHover DEBUG" (requires restart)
+5 −0
Original line number Diff line number Diff line
@@ -164,6 +164,11 @@ std::string KeyEntry::getDescription() const {
                        keyCode, scanCode, metaState, repeatCount, policyFlags);
}

std::ostream& operator<<(std::ostream& out, const KeyEntry& keyEntry) {
    out << keyEntry.getDescription();
    return out;
}

// --- TouchModeEntry ---

TouchModeEntry::TouchModeEntry(int32_t id, nsecs_t eventTime, bool inTouchMode, int displayId)
+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@

#include "InjectionState.h"
#include "InputTarget.h"
#include "trace/EventTrackerInterface.h"

#include <gui/InputApplication.h>
#include <input/Input.h>
@@ -125,6 +126,7 @@ struct KeyEntry : EventEntry {
    int32_t scanCode;
    int32_t metaState;
    nsecs_t downTime;
    std::unique_ptr<trace::EventTrackerInterface> traceTracker;

    bool syntheticRepeat; // set to true for synthetic key repeats

@@ -147,6 +149,8 @@ struct KeyEntry : EventEntry {
    std::string getDescription() const override;
};

std::ostream& operator<<(std::ostream& out, const KeyEntry& motionEntry);

struct MotionEntry : EventEntry {
    int32_t deviceId;
    uint32_t source;
@@ -165,6 +169,7 @@ struct MotionEntry : EventEntry {
    nsecs_t downTime;
    std::vector<PointerProperties> pointerProperties;
    std::vector<PointerCoords> pointerCoords;
    std::unique_ptr<trace::EventTrackerInterface> traceTracker;

    size_t getPointerCount() const { return pointerProperties.size(); }

Loading