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

Commit 7c3ae9c7 authored by Arthur Hung's avatar Arthur Hung
Browse files

Use std::vector over Vector for InputFlinger (1/3) 

Replace Vector<T> with std::vector<T>.

Bug: 112399697
Test: atest inputflinger_tests
Change-Id: I8baec68f7a684d97210077f3e387ca1096586a25
parent 106155a2

include/input/IInputFlinger.h

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <binder/IInterface.h>



#include <utils/Vector.h>

#include <input/InputWindow.h>

#include <input/ISetInputWindowsListener.h>
@@ -36,7 +35,7 @@ class IInputFlinger : public IInterface { 
public:

    DECLARE_META_INTERFACE(InputFlinger)



    virtual void setInputWindows(const Vector<InputWindowInfo>& inputHandles,

    virtual void setInputWindows(const std::vector<InputWindowInfo>& inputHandles,

            const sp<ISetInputWindowsListener>& setInputWindowsListener) = 0;

    virtual void transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken) = 0;

    virtual void registerInputChannel(const sp<InputChannel>& channel) = 0;

include/input/InputDevice.h

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <input/Input.h>

#include <input/KeyCharacterMap.h>

#include <vector>



namespace android {
@@ -121,7 +122,7 @@ public: 
    inline void setButtonUnderPad(bool hasButton) { mHasButtonUnderPad = hasButton; }

    inline bool hasButtonUnderPad() const { return mHasButtonUnderPad; }



    inline const Vector<MotionRange>& getMotionRanges() const {

    inline const std::vector<MotionRange>& getMotionRanges() const {

        return mMotionRanges;

    }
@@ -139,7 +140,7 @@ private: 
    bool mHasVibrator;

    bool mHasButtonUnderPad;



    Vector<MotionRange> mMotionRanges;

    std::vector<MotionRange> mMotionRanges;

};



/* Types of input device configuration files. */

include/input/KeyLayoutMap.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public: 


    status_t mapKey(int32_t scanCode, int32_t usageCode,

            int32_t* outKeyCode, uint32_t* outFlags) const;

    status_t findScanCodesForKey(int32_t keyCode, Vector<int32_t>* outScanCodes) const;

    status_t findScanCodesForKey(int32_t keyCode, std::vector<int32_t>* outScanCodes) const;

    status_t findScanCodeForLed(int32_t ledCode, int32_t* outScanCode) const;

    status_t findUsageCodeForLed(int32_t ledCode, int32_t* outUsageCode) const;

include/input/VirtualKeyMap.h

+3 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <utils/KeyedVector.h>

#include <utils/Tokenizer.h>

#include <utils/Unicode.h>

#include <vector>



namespace android {
@@ -51,7 +52,7 @@ public: 


    static std::unique_ptr<VirtualKeyMap> load(const std::string& filename);



    inline const Vector<VirtualKeyDefinition>& getVirtualKeys() const {

    inline const std::vector<VirtualKeyDefinition>& getVirtualKeys() const {

        return mVirtualKeys;

    }
@@ -70,7 +71,7 @@ private: 
        bool parseNextIntField(int32_t* outValue);

    };



    Vector<VirtualKeyDefinition> mVirtualKeys;

    std::vector<VirtualKeyDefinition> mVirtualKeys;



    VirtualKeyMap();

};

libs/input/IInputFlinger.cpp

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public: 
    explicit BpInputFlinger(const sp<IBinder>& impl) :

            BpInterface<IInputFlinger>(impl) { }



    virtual void setInputWindows(const Vector<InputWindowInfo>& inputInfo,

    virtual void setInputWindows(const std::vector<InputWindowInfo>& inputInfo,

            const sp<ISetInputWindowsListener>& setInputWindowsListener) {

        Parcel data, reply;

        data.writeInterfaceToken(IInputFlinger::getInterfaceDescriptor());
@@ -81,10 +81,9 @@ status_t BnInputFlinger::onTransact( 
        if (count > data.dataSize()) {

            return BAD_VALUE;

        }

        Vector<InputWindowInfo> handles;

        handles.setCapacity(count);

        std::vector<InputWindowInfo> handles;

        for (size_t i = 0; i < count; i++) {

            handles.add(InputWindowInfo(data));

            handles.push_back(InputWindowInfo::read(data));

        }

        const sp<ISetInputWindowsListener> setInputWindowsListener =

                ISetInputWindowsListener::asInterface(data.readStrongBinder());