From c1ae5568e5d6b39499f0c46e7f5ae2a8759d2ecd Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Tue, 30 Jun 2020 14:22:57 -0500 Subject: Use chrono for dispatching timeout To prevent confusion about the units of dispatchingTimeout, convert to chrono. Bug: 155931890 Test: atest inputflinger_tests Change-Id: Icfcb3bad7188052a6b047b3cbe836be8d928fad2 --- libs/input/InputWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/input/InputWindow.cpp') diff --git a/libs/input/InputWindow.cpp b/libs/input/InputWindow.cpp index 04550227e3..3700e8f0f8 100644 --- a/libs/input/InputWindow.cpp +++ b/libs/input/InputWindow.cpp @@ -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(); -- cgit v1.2.3-59-g8ed1b