From 45c1d0c19285f3abcbf394357541027841995c8e Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Thu, 24 Jan 2019 10:38:02 -0800 Subject: [PATCH] Move input definitions into separate HAL The types added for input in InputClassifier HAL are not specific to that HAL. These are common input definitions. To allow for future reuse in this and other HALs, move these definitions into a separate, type-only HAL android::hardware::input::common. This will be similar to such existing HALs as: hardware/interfaces/graphics/common hardware/interfaces/camera/common hardware/interfaces/audio/common Test: make only Bug: 111480215 Change-Id: I16d76d6bdb48b24487b232fda45c6146e1003fe9 --- input/classifier/1.0/Android.bp | 19 +---------- input/classifier/1.0/IInputClassifier.hal | 3 ++ .../1.0/default/InputClassifier.cpp | 2 +- .../classifier/1.0/default/InputClassifier.h | 5 +-- input/common/1.0/Android.bp | 34 +++++++++++++++++++ input/{classifier => common}/1.0/types.hal | 14 ++++---- 6 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 input/common/1.0/Android.bp rename input/{classifier => common}/1.0/types.hal (99%) diff --git a/input/classifier/1.0/Android.bp b/input/classifier/1.0/Android.bp index c3c6fc6123..6815a513c1 100644 --- a/input/classifier/1.0/Android.bp +++ b/input/classifier/1.0/Android.bp @@ -7,29 +7,12 @@ hidl_interface { enabled: true, }, srcs: [ - "types.hal", "IInputClassifier.hal", ], interfaces: [ + "android.hardware.input.common@1.0", "android.hidl.base@1.0", ], - types: [ - "Action", - "Axis", - "Button", - "Classification", - "EdgeFlag", - "Flag", - "Meta", - "MotionEvent", - "PointerCoords", - "PointerProperties", - "PolicyFlag", - "Source", - "SourceClass", - "ToolType", - "VideoFrame", - ], gen_java: true, } diff --git a/input/classifier/1.0/IInputClassifier.hal b/input/classifier/1.0/IInputClassifier.hal index edc113807a..5f8c2a564d 100644 --- a/input/classifier/1.0/IInputClassifier.hal +++ b/input/classifier/1.0/IInputClassifier.hal @@ -16,6 +16,9 @@ package android.hardware.input.classifier@1.0; +import android.hardware.input.common@1.0::Classification; +import android.hardware.input.common@1.0::MotionEvent; + interface IInputClassifier { /** diff --git a/input/classifier/1.0/default/InputClassifier.cpp b/input/classifier/1.0/default/InputClassifier.cpp index c463361dcb..7005e9d8b6 100644 --- a/input/classifier/1.0/default/InputClassifier.cpp +++ b/input/classifier/1.0/default/InputClassifier.cpp @@ -21,7 +21,7 @@ #include #include -using namespace android::hardware::input::classifier::V1_0; +using namespace android::hardware::input::common::V1_0; namespace android { namespace hardware { diff --git a/input/classifier/1.0/default/InputClassifier.h b/input/classifier/1.0/default/InputClassifier.h index 0858ecbae0..39c4b17b38 100644 --- a/input/classifier/1.0/default/InputClassifier.h +++ b/input/classifier/1.0/default/InputClassifier.h @@ -31,8 +31,9 @@ using ::android::hardware::Return; struct InputClassifier : public IInputClassifier { // Methods from ::android::hardware::input::classifier::V1_0::IInputClassifier follow. - Return classify( - const ::android::hardware::input::classifier::V1_0::MotionEvent& event) override; + + Return classify( + const android::hardware::input::common::V1_0::MotionEvent& event) override; }; } // namespace implementation diff --git a/input/common/1.0/Android.bp b/input/common/1.0/Android.bp new file mode 100644 index 0000000000..68a77f13d9 --- /dev/null +++ b/input/common/1.0/Android.bp @@ -0,0 +1,34 @@ +// This file is autogenerated by hidl-gen -Landroidbp. + +hidl_interface { + name: "android.hardware.input.common@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, + srcs: [ + "types.hal", + ], + interfaces: [ + "android.hidl.base@1.0", + ], + types: [ + "Action", + "Axis", + "Button", + "Classification", + "EdgeFlag", + "Flag", + "Meta", + "MotionEvent", + "PointerCoords", + "PointerProperties", + "PolicyFlag", + "Source", + "SourceClass", + "ToolType", + "VideoFrame", + ], + gen_java: true, +} + diff --git a/input/classifier/1.0/types.hal b/input/common/1.0/types.hal similarity index 99% rename from input/classifier/1.0/types.hal rename to input/common/1.0/types.hal index 244ecd93b8..1a07f3b76d 100644 --- a/input/classifier/1.0/types.hal +++ b/input/common/1.0/types.hal @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.input.classifier@1.0; +package android.hardware.input.common@1.0; /** @@ -435,12 +435,12 @@ struct PointerCoords { }; enum SourceClass: uint8_t { - NONE = 1 << 0, - BUTTON = 1 << 1, - POINTER = 1 << 2, - NAVIGATION = 1 << 3, - POSITION = 1 << 4, - JOYSTICK = 1 << 5, + NONE = 0 << 0, + BUTTON = 1 << 0, + POINTER = 1 << 1, + NAVIGATION = 1 << 2, + POSITION = 1 << 3, + JOYSTICK = 1 << 4, }; /**