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

Commit 253f464b authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Use ftl::Flags for InputTarget flags 

These flags will now be type-safe.

Bug: 211379801
Test: m inputflinger_tests && adb sync data && adb shell -t /data/nativetest64/inputflinger_tests/inputflinger_tests
Change-Id: If1835151df74cfebf39ec3471f826082bea30e26
parent 6e1e987e

include/ftl/flags.h

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public: 
    /* Tests whether all of the given flags are set */

    bool all(Flags<F> f) const { return (mFlags & f.mFlags) == f.mFlags; }



    Flags<F> operator|(Flags<F> rhs) const { return static_cast<F>(mFlags | rhs.mFlags); }

    constexpr Flags<F> operator|(Flags<F> rhs) const { return static_cast<F>(mFlags | rhs.mFlags); }

    Flags<F>& operator|=(Flags<F> rhs) {

        mFlags = mFlags | rhs.mFlags;

        return *this;
@@ -217,7 +217,7 @@ inline Flags<F> operator~(F f) { 
}



template <typename F, typename = std::enable_if_t<is_scoped_enum_v<F>>>

Flags<F> operator|(F lhs, F rhs) {

constexpr Flags<F> operator|(F lhs, F rhs) {

    return static_cast<F>(to_underlying(lhs) | to_underlying(rhs));

}

services/inputflinger/dispatcher/Entry.cpp

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ std::string SensorEntry::getDescription() const { 


volatile int32_t DispatchEntry::sNextSeqAtomic;



DispatchEntry::DispatchEntry(std::shared_ptr<EventEntry> eventEntry, int32_t targetFlags,

DispatchEntry::DispatchEntry(std::shared_ptr<EventEntry> eventEntry,

                             ftl::Flags<InputTarget::Flags> targetFlags,

                             const ui::Transform& transform, const ui::Transform& rawTransform,

                             float globalScaleFactor)

      : seq(nextSeq()),

services/inputflinger/dispatcher/Entry.h

+8 −6
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ struct DispatchEntry { 
    const uint32_t seq; // unique sequence number, never 0



    std::shared_ptr<EventEntry> eventEntry; // the event to dispatch

    int32_t targetFlags;

    ftl::Flags<InputTarget::Flags> targetFlags;

    ui::Transform transform;

    ui::Transform rawTransform;

    float globalScaleFactor;
@@ -238,13 +238,15 @@ struct DispatchEntry { 
    int32_t resolvedAction;

    int32_t resolvedFlags;



    DispatchEntry(std::shared_ptr<EventEntry> eventEntry, int32_t targetFlags,

                  const ui::Transform& transform, const ui::Transform& rawTransform,

                  float globalScaleFactor);

    DispatchEntry(std::shared_ptr<EventEntry> eventEntry,

                  ftl::Flags<InputTarget::Flags> targetFlags, const ui::Transform& transform,

                  const ui::Transform& rawTransform, float globalScaleFactor);



    inline bool hasForegroundTarget() const { return targetFlags & InputTarget::FLAG_FOREGROUND; }

    inline bool hasForegroundTarget() const {

        return targetFlags.test(InputTarget::Flags::FOREGROUND);

    }



    inline bool isSplit() const { return targetFlags & InputTarget::FLAG_SPLIT; }

    inline bool isSplit() const { return targetFlags.test(InputTarget::Flags::SPLIT); }



private:

    static volatile int32_t sNextSeqAtomic;

services/inputflinger/dispatcher/InputDispatcher.cpp

+83 −78

File changed.

Preview size limit exceeded, changes collapsed.

services/inputflinger/dispatcher/InputDispatcher.h

+3 −3
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ private: 
            const std::vector<Monitor>& gestureMonitors) const REQUIRES(mLock);



    void addWindowTargetLocked(const sp<android::gui::WindowInfoHandle>& windowHandle,

                               int32_t targetFlags, BitSet32 pointerIds,

                               ftl::Flags<InputTarget::Flags> targetFlags, BitSet32 pointerIds,

                               std::optional<nsecs_t> firstDownTimeInTarget,

                               std::vector<InputTarget>& inputTargets) const REQUIRES(mLock);

    void addGlobalMonitoringTargetsLocked(std::vector<InputTarget>& inputTargets, int32_t displayId)
@@ -600,8 +600,8 @@ private: 
                                      std::shared_ptr<EventEntry>, const InputTarget& inputTarget)

            REQUIRES(mLock);

    void enqueueDispatchEntryLocked(const sp<Connection>& connection, std::shared_ptr<EventEntry>,

                                    const InputTarget& inputTarget, int32_t dispatchMode)

            REQUIRES(mLock);

                                    const InputTarget& inputTarget,

                                    ftl::Flags<InputTarget::Flags> dispatchMode) REQUIRES(mLock);

    status_t publishMotionEvent(Connection& connection, DispatchEntry& dispatchEntry) const;

    void startDispatchCycleLocked(nsecs_t currentTime, const sp<Connection>& connection)

            REQUIRES(mLock);