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
This commit is contained in:
Siarhei Vishniakou
2019-01-24 10:38:02 -08:00
parent 56ac36d3ab
commit 45c1d0c192
6 changed files with 49 additions and 28 deletions

View File

@@ -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,
}

View File

@@ -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 {
/**

View File

@@ -21,7 +21,7 @@
#include <log/log.h>
#include <utils/Timers.h>
using namespace android::hardware::input::classifier::V1_0;
using namespace android::hardware::input::common::V1_0;
namespace android {
namespace hardware {

View File

@@ -31,8 +31,9 @@ using ::android::hardware::Return;
struct InputClassifier : public IInputClassifier {
// Methods from ::android::hardware::input::classifier::V1_0::IInputClassifier follow.
Return<Classification> classify(
const ::android::hardware::input::classifier::V1_0::MotionEvent& event) override;
Return<android::hardware::input::common::V1_0::Classification> classify(
const android::hardware::input::common::V1_0::MotionEvent& event) override;
};
} // namespace implementation

View File

@@ -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,
}

View File

@@ -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,
};
/**