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

Commit ecb70239 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use chrono for dispatching timeout"

parents 2dbcd497 c1ae5568

include/input/InputApplication.h

+1 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace android { 
struct InputApplicationInfo {

    sp<IBinder> token;

    std::string name;

    nsecs_t dispatchingTimeout;

    std::chrono::nanoseconds dispatchingTimeout;



    status_t write(Parcel& output) const;

    static InputApplicationInfo read(const Parcel& from);
@@ -57,10 +57,6 @@ public: 
        return !mInfo.name.empty() ? mInfo.name : "<invalid>";

    }



    inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const {

        return mInfo.token ? mInfo.dispatchingTimeout : defaultValue;

    }



    inline std::chrono::nanoseconds getDispatchingTimeout(

            std::chrono::nanoseconds defaultValue) const {

        return mInfo.token ? std::chrono::nanoseconds(mInfo.dispatchingTimeout) : defaultValue;

include/input/InputWindow.h

+1 −5
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct InputWindowInfo { 
    std::string name;

    int32_t layoutParamsFlags = 0;

    int32_t layoutParamsType = 0;

    nsecs_t dispatchingTimeout = -1;

    std::chrono::nanoseconds dispatchingTimeout = std::chrono::seconds(5);



    /* These values are filled in by SurfaceFlinger. */

    int32_t frameLeft = -1;
@@ -227,10 +227,6 @@ public: 
        return !mInfo.name.empty() ? mInfo.name : "<invalid>";

    }



    inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const {

        return mInfo.token ? mInfo.dispatchingTimeout : defaultValue;

    }



    inline std::chrono::nanoseconds getDispatchingTimeout(

            std::chrono::nanoseconds defaultValue) const {

        return mInfo.token ? std::chrono::nanoseconds(mInfo.dispatchingTimeout) : defaultValue;

libs/gui/tests/EndToEndNativeInputTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ private: 
        mInputInfo.name = "Test info";

        mInputInfo.layoutParamsFlags = InputWindowInfo::FLAG_NOT_TOUCH_MODAL;

        mInputInfo.layoutParamsType = InputWindowInfo::TYPE_BASE_APPLICATION;

        mInputInfo.dispatchingTimeout = seconds_to_nanoseconds(5);

        mInputInfo.dispatchingTimeout = 5s;

        mInputInfo.globalScaleFactor = 1.0;

        mInputInfo.canReceiveKeys = true;

        mInputInfo.hasFocus = true;
@@ -207,7 +207,7 @@ private: 
        InputApplicationInfo aInfo;

        aInfo.token = new BBinder();

        aInfo.name = "Test app info";

        aInfo.dispatchingTimeout = seconds_to_nanoseconds(5);

        aInfo.dispatchingTimeout = 5s;



        mInputInfo.applicationInfo = aInfo;

    }

libs/input/InputApplication.cpp

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ InputApplicationInfo InputApplicationInfo::read(const Parcel& from) { 
    InputApplicationInfo ret;

    ret.token = from.readStrongBinder();

    ret.name = from.readString8().c_str();

    ret.dispatchingTimeout = from.readInt64();

    ret.dispatchingTimeout = decltype(ret.dispatchingTimeout)(from.readInt64());



    return ret;

}
@@ -42,7 +42,7 @@ InputApplicationInfo InputApplicationInfo::read(const Parcel& from) { 
status_t InputApplicationInfo::write(Parcel& output) const {

    output.writeStrongBinder(token);

    output.writeString8(String8(name.c_str()));

    output.writeInt64(dispatchingTimeout);

    output.writeInt64(dispatchingTimeout.count());



    return OK;

}

libs/input/InputWindow.cpp

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ status_t InputWindowInfo::write(Parcel& output) const { 
    output.writeString8(String8(name.c_str()));

    output.writeInt32(layoutParamsFlags);

    output.writeInt32(layoutParamsType);

    output.writeInt64(dispatchingTimeout);

    output.writeInt64(dispatchingTimeout.count());

    output.writeInt32(frameLeft);

    output.writeInt32(frameTop);

    output.writeInt32(frameRight);
@@ -216,7 +216,7 @@ InputWindowInfo InputWindowInfo::read(const Parcel& from) { 
    ret.name = from.readString8().c_str();

    ret.layoutParamsFlags = from.readInt32();

    ret.layoutParamsType = from.readInt32();

    ret.dispatchingTimeout = from.readInt64();

    ret.dispatchingTimeout = decltype(ret.dispatchingTimeout)(from.readInt64());

    ret.frameLeft = from.readInt32();

    ret.frameTop = from.readInt32();

    ret.frameRight = from.readInt32();