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

Commit 6b323bd5 authored by Cody Heiner's avatar Cody Heiner Committed by Automerger Merge Worker
Browse files

Merge "Move EventBuilders.h next to MotionEvent definitions" into udc-qpr-dev... 

Merge "Move EventBuilders.h next to MotionEvent definitions" into udc-qpr-dev am: 6db5aaf6 am: 0baef930

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23696774



Change-Id: Ie1e9901bc929865e9f5266fbea44e47c287e1d0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8be70cb9 0baef930

services/inputflinger/tests/InputDeviceMetricsCollector_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ 


#include <gtest/gtest.h>

#include <gui/constants.h>

#include <input/EventBuilders.h>

#include <linux/input.h>



#include <array>

#include <tuple>



#include "EventBuilders.h"

#include "TestInputListener.h"



namespace android {

services/inputflinger/tests/InputDispatcher_test.cpp

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


#include "../dispatcher/InputDispatcher.h"

#include "../BlockingQueue.h"

#include "EventBuilders.h"



#include <android-base/properties.h>

#include <android-base/silent_death_test.h>
@@ -26,6 +25,7 @@ 
#include <fcntl.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <input/EventBuilders.h>

#include <input/Input.h>

#include <linux/input.h>

#include <sys/epoll.h>