Merge "Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS."
diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp
index 2ded34b..254c939 100644
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -86,18 +86,18 @@
generated_headers: ["android.hardware.audio@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.audio.common@2.0",
- "android.hardware.audio.effect@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.audio.common@2.0",
- "android.hardware.audio.effect@2.0",
],
}
diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index a5c0383..5108448 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -30,7 +30,8 @@
StreamOut.cpp \
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
libhardware \
@@ -55,7 +56,8 @@
service.cpp
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
liblog \
libhwbinder \
libutils \
diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp
index 89ce3b6..c539c3c 100644
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -30,13 +30,15 @@
generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp
index 78829be..11ea604 100644
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -142,14 +142,16 @@
generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.audio.common@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.audio.common@2.0",
diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk
index 50c4bd6..9b99737 100644
--- a/audio/effect/2.0/default/Android.mk
+++ b/audio/effect/2.0/default/Android.mk
@@ -20,7 +20,8 @@
VisualizerEffect.cpp \
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
libeffects \
diff --git a/audio/effect/2.0/vts/functional/Android.bp b/audio/effect/2.0/vts/functional/Android.bp
index fc198e5..b82d44a 100644
--- a/audio/effect/2.0/vts/functional/Android.bp
+++ b/audio/effect/2.0/vts/functional/Android.bp
@@ -22,7 +22,8 @@
"libbase",
"liblog",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libnativehelper",
"libutils",
diff --git a/benchmarks/msgq/1.0/Android.bp b/benchmarks/msgq/1.0/Android.bp
index a527b32..06ec3da 100644
--- a/benchmarks/msgq/1.0/Android.bp
+++ b/benchmarks/msgq/1.0/Android.bp
@@ -34,13 +34,15 @@
generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.benchmarks.msgq@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp
index 9d2af44..cea7200 100644
--- a/biometrics/fingerprint/2.1/Android.bp
+++ b/biometrics/fingerprint/2.1/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"],
export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk
index be8bae6..c487c7a 100644
--- a/biometrics/fingerprint/2.1/default/Android.mk
+++ b/biometrics/fingerprint/2.1/default/Android.mk
@@ -8,7 +8,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhardware \
libhwbinder \
libutils \
diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp
index d8f3ca5..67417fb 100644
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp
index cad7497..835d358 100644
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.boot@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/boot/1.0/default/Android.mk b/boot/1.0/default/Android.mk
index 50fd1e4..be67779 100644
--- a/boot/1.0/default/Android.mk
+++ b/boot/1.0/default/Android.mk
@@ -8,7 +8,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libhardware \
libutils \
@@ -27,7 +28,8 @@
liblog \
libhwbinder \
libhardware \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libutils \
android.hardware.boot@1.0 \
diff --git a/boot/1.0/vts/Android.mk b/boot/1.0/vts/Android.mk
index 5604ca8..8a56b27 100644
--- a/boot/1.0/vts/Android.mk
+++ b/boot/1.0/vts/Android.mk
@@ -31,7 +31,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -64,7 +65,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp
index c337e08..a876ac2 100644
--- a/broadcastradio/1.0/Android.bp
+++ b/broadcastradio/1.0/Android.bp
@@ -62,13 +62,15 @@
generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp
index 23c44de..f13ef5b 100644
--- a/contexthub/1.0/Android.bp
+++ b/contexthub/1.0/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/example/extension/light/2.0/Android.bp b/example/extension/light/2.0/Android.bp
index 2a4eddf..ae93a6b 100644
--- a/example/extension/light/2.0/Android.bp
+++ b/example/extension/light/2.0/Android.bp
@@ -38,14 +38,16 @@
generated_headers: ["android.hardware.example.extension.light@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.example.extension.light@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.light@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.light@2.0",
diff --git a/example/extension/light/2.0/default/Android.mk b/example/extension/light/2.0/default/Android.mk
index fa68787..55c21b9 100644
--- a/example/extension/light/2.0/default/Android.mk
+++ b/example/extension/light/2.0/default/Android.mk
@@ -8,7 +8,8 @@
Light.cpp \
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
android.hardware.light@2.0 \
diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp
index 1f538ca..f33f1c6 100644
--- a/gnss/1.0/Android.bp
+++ b/gnss/1.0/Android.bp
@@ -166,13 +166,15 @@
generated_headers: ["android.hardware.gnss@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.gnss@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 004d7d2..4cf1e7f 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp
index 8eac8f5..994feb3 100644
--- a/graphics/allocator/2.0/default/Android.bp
+++ b/graphics/allocator/2.0/default/Android.bp
@@ -8,7 +8,8 @@
"libbase",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
@@ -23,7 +24,8 @@
shared_libs: [
"android.hardware.graphics.allocator@2.0",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp
index fa95ca0..6c6ebbe 100644
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -30,13 +30,15 @@
generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/graphics/common/1.0/types.hal b/graphics/common/1.0/types.hal
index 395af49..9726c3a 100644
--- a/graphics/common/1.0/types.hal
+++ b/graphics/common/1.0/types.hal
@@ -38,6 +38,12 @@
BGRA_8888 = 5,
/*
+ * The following formats use a 16bit float per color component.
+ */
+ RGBA_FP16 = 0x10,
+ RGBX_FP16 = 0x11,
+
+ /*
* 0x100 - 0x1FF
*
* This range is reserved for pixel formats that are specific to the HAL
@@ -658,6 +664,28 @@
*/
STANDARD_FILM = 9 << STANDARD_SHIFT,
+ /*
+ * SMPTE EG 432-1 and SMPTE RP 431-2. (DCI-P3)
+ * Primaries: x y
+ * green 0.265 0.690
+ * blue 0.150 0.060
+ * red 0.680 0.320
+ * white (D65) 0.3127 0.3290
+ */
+ STANDARD_DCI_P3 = 10 << STANDARD_SHIFT,
+
+ /*
+ * Adobe RGB
+ * Primaries: x y
+ * green 0.210 0.710
+ * blue 0.150 0.060
+ * red 0.640 0.330
+ * white (D65) 0.3127 0.3290
+ */
+ STANDARD_ADOBE_RGB = 11 << STANDARD_SHIFT,
+
+
+
TRANSFER_SHIFT = 22,
/*
@@ -730,6 +758,16 @@
TRANSFER_GAMMA2_2 = 4 << TRANSFER_SHIFT,
/*
+ * display gamma 2.6.
+ *
+ * Transfer characteristic curve:
+ * E = L ^ (1/2.6)
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal
+ */
+ TRANSFER_GAMMA2_6 = 5 << TRANSFER_SHIFT,
+
+ /*
* display gamma 2.8.
*
* Transfer characteristic curve:
@@ -737,7 +775,7 @@
* L - luminance of image 0 <= L <= 1 for conventional colorimetry
* E - corresponding electrical signal
*/
- TRANSFER_GAMMA2_8 = 5 << TRANSFER_SHIFT,
+ TRANSFER_GAMMA2_8 = 6 << TRANSFER_SHIFT,
/*
* SMPTE ST 2084
@@ -753,7 +791,7 @@
* L = 1 corresponds to 10000 cd/m2
* E - corresponding electrical signal
*/
- TRANSFER_ST2084 = 6 << TRANSFER_SHIFT,
+ TRANSFER_ST2084 = 7 << TRANSFER_SHIFT,
/*
* ARIB STD-B67 Hybrid Log Gamma
@@ -769,7 +807,7 @@
* to reference white level of 100 cd/m2
* E - corresponding electrical signal
*/
- TRANSFER_HLG = 7 << TRANSFER_SHIFT,
+ TRANSFER_HLG = 8 << TRANSFER_SHIFT,
RANGE_SHIFT = 27,
@@ -816,6 +854,15 @@
RANGE_LIMITED = 2 << RANGE_SHIFT,
/*
+ * Extended range is used for scRGB. Intended for use with
+ * floating point pixel formats. [0.0 - 1.0] is the standard
+ * sRGB space. Values outside the range 0.0 - 1.0 can encode
+ * color outside the sRGB gamut.
+ * Used to blend / merge multiple dataspaces on a single display.
+ */
+ RANGE_EXTENDED = 3 << RANGE_SHIFT,
+
+ /*
* Legacy dataspaces
*/
@@ -835,6 +882,21 @@
/*
+ * scRGB linear encoding:
+ *
+ * The red, green, and blue components are stored in extended sRGB space,
+ * but are linear, not gamma-encoded.
+ * The RGB primaries and the white point are the same as BT.709.
+ *
+ * The values are floating point.
+ * A pixel value of 1.0, 1.0, 1.0 corresponds to sRGB white (D65) at 80 nits.
+ * Values beyond the range [0.0 - 1.0] would correspond to other colors
+ * spaces and/or HDR content.
+ */
+ V0_SCRGB_LINEAR = STANDARD_BT709 | TRANSFER_LINEAR | RANGE_EXTENDED,
+
+
+ /*
* sRGB gamma encoding:
*
* The red, green and blue components are stored in sRGB space, and
@@ -853,6 +915,24 @@
/*
+ * scRGB:
+ *
+ * The red, green, and blue components are stored in extended sRGB space,
+ * but are linear, not gamma-encoded.
+ * The RGB primaries and the white point are the same as BT.709.
+ *
+ * The values are floating point.
+ * A pixel value of 1.0, 1.0, 1.0 corresponds to sRGB white (D65) at 80 nits.
+ * Values beyond the range [0.0 - 1.0] would correspond to other colors
+ * spaces and/or HDR content.
+ *
+ * TODO (courtneygo): Will we actually use this? We intend to use FP16
+ * storage for data using scRGB so we can do all work in linear space
+ * and don't have to worry as much about limited precision.
+ */
+ V0_SCRGB = STANDARD_BT709 | TRANSFER_SRGB | RANGE_EXTENDED,
+
+ /*
* YCbCr Colorspaces
* -----------------
*
@@ -908,6 +988,59 @@
V0_BT709 = STANDARD_BT709 | TRANSFER_SMPTE_170M | RANGE_LIMITED,
+
+ /*
+ * SMPTE EG 432-1 and SMPTE RP 431-2.
+ *
+ * Digital Cinema DCI-P3
+ *
+ * Use full range, linear transfer and D65 DCI-P3 standard
+ */
+ DCI_P3_LINEAR = STANDARD_DCI_P3 | TRANSFER_LINEAR | RANGE_FULL,
+
+
+ /*
+ * SMPTE EG 432-1 and SMPTE RP 431-2.
+ *
+ * Digital Cinema DCI-P3
+ *
+ * Use full range, gamma 2.6 transfer and D65 DCI-P3 standard
+ * Note: Application is responsible for gamma encoding the data as
+ * a 2.6 gamma encoding is not supported in HW.
+ */
+ DCI_P3 = STANDARD_DCI_P3 | TRANSFER_GAMMA2_6 | RANGE_FULL,
+
+
+ /*
+ * Adobe RGB
+ *
+ * Use full range, gamma 2.2 transfer and Adobe RGB primaries
+ * Note: Application is responsible for gamma encoding the data as
+ * a 2.2 gamma encoding is not supported in HW.
+ */
+ ADOBE_RGB = STANDARD_ADOBE_RGB | TRANSFER_GAMMA2_2 | RANGE_FULL,
+
+
+ /*
+ * ITU-R Recommendation 2020 (BT.2020)
+ *
+ * Ultra High-definition television
+ *
+ * Use full range, linear transfer and BT2020 standard
+ */
+ BT2020_LINEAR = STANDARD_BT2020 | TRANSFER_LINEAR | RANGE_FULL,
+
+
+ /*
+ * ITU-R Recommendation 2020 (BT.2020)
+ *
+ * Ultra High-definition television
+ *
+ * Use full range, BT.709 transfer and BT2020 standard
+ */
+ BT2020 = STANDARD_BT2020 | TRANSFER_SMPTE_170M | RANGE_FULL,
+
+
/*
* Data spaces for non-color formats
*/
diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp
index fa58dbb..8742e88 100644
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -46,14 +46,16 @@
generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.graphics.allocator@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.graphics.allocator@2.0",
diff --git a/graphics/composer/2.1/default/Android.bp b/graphics/composer/2.1/default/Android.bp
index 6936347..22f4906 100644
--- a/graphics/composer/2.1/default/Android.bp
+++ b/graphics/composer/2.1/default/Android.bp
@@ -8,7 +8,8 @@
"libbase",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
@@ -29,7 +30,8 @@
"libbinder",
"libcutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp
index b738ae8..7da6eb1 100644
--- a/graphics/mapper/2.0/default/Android.bp
+++ b/graphics/mapper/2.0/default/Android.bp
@@ -21,7 +21,8 @@
shared_libs: [
"android.hardware.graphics.allocator@2.0",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
],
diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp
index fb3d8c0..81793d5 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.health@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.health@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/health/1.0/default/Android.mk b/health/1.0/default/Android.mk
index 3d9d58a..89d28cb 100644
--- a/health/1.0/default/Android.mk
+++ b/health/1.0/default/Android.mk
@@ -9,7 +9,8 @@
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
liblog \
libutils \
@@ -28,7 +29,8 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SHARED_LIBRARIES := \
libcutils \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libutils \
android.hardware.health@1.0 \
@@ -48,7 +50,8 @@
libbase \
libutils \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.health@1.0 \
include $(BUILD_EXECUTABLE)
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index b762cc1..23c7c9c 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.light@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.light@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/light/2.0/default/Android.mk b/light/2.0/default/Android.mk
index 61f4cc9..d14d7c0 100644
--- a/light/2.0/default/Android.mk
+++ b/light/2.0/default/Android.mk
@@ -7,7 +7,8 @@
Light.cpp \
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
liblog \
@@ -37,7 +38,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.light@2.0 \
include $(BUILD_EXECUTABLE)
diff --git a/light/2.0/vts/Android.mk b/light/2.0/vts/Android.mk
index c80e697..59e8f35 100644
--- a/light/2.0/vts/Android.mk
+++ b/light/2.0/vts/Android.mk
@@ -31,7 +31,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp
index c8bdd82..5a63cac 100644
--- a/media/1.0/Android.bp
+++ b/media/1.0/Android.bp
@@ -30,14 +30,16 @@
generated_headers: ["android.hardware.media@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.media@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.graphics.common@1.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.graphics.common@1.0",
diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp
index 95d88a6..b8afb98 100644
--- a/media/omx/1.0/Android.bp
+++ b/media/omx/1.0/Android.bp
@@ -70,7 +70,8 @@
generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
@@ -78,7 +79,8 @@
"android.hardware.media@1.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.graphics.common@1.0",
diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp
index 83c09cf..c5727c1 100644
--- a/memtrack/1.0/Android.bp
+++ b/memtrack/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/memtrack/1.0/default/Android.bp b/memtrack/1.0/default/Android.bp
index 50d2318..91fa1ea 100644
--- a/memtrack/1.0/default/Android.bp
+++ b/memtrack/1.0/default/Android.bp
@@ -20,7 +20,8 @@
shared_libs: [
"libbase",
"liblog",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhardware",
"libhwbinder",
"libutils",
@@ -41,7 +42,8 @@
"libdl",
"libutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"android.hardware.memtrack@1.0",
],
diff --git a/memtrack/1.0/vts/Android.mk b/memtrack/1.0/vts/Android.mk
index 9b58e13..8a5ceb1 100644
--- a/memtrack/1.0/vts/Android.mk
+++ b/memtrack/1.0/vts/Android.mk
@@ -31,7 +31,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -64,7 +65,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp
index b6e8d08..9584636 100644
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp
index a8c4c81..b484ba6 100644
--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@@ -10,7 +10,8 @@
"libbase",
"libcutils",
"libutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"android.hardware.nfc@1.0",
],
}
diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk
index d4e46f8..a6c7d5c 100644
--- a/nfc/1.0/default/Android.mk
+++ b/nfc/1.0/default/Android.mk
@@ -18,7 +18,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.nfc@1.0 \
include $(BUILD_EXECUTABLE)
diff --git a/nfc/1.0/vts/Android.mk b/nfc/1.0/vts/Android.mk
index 0db7107..04884b7 100644
--- a/nfc/1.0/vts/Android.mk
+++ b/nfc/1.0/vts/Android.mk
@@ -32,7 +32,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -65,7 +66,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -96,7 +98,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp
index 0f1afbd..0f9eb3d 100644
--- a/nfc/1.0/vts/functional/Android.bp
+++ b/nfc/1.0/vts/functional/Android.bp
@@ -22,7 +22,8 @@
"libbase",
"liblog",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libnativehelper",
"libutils",
@@ -33,4 +34,4 @@
"-O0",
"-g",
],
-}
\ No newline at end of file
+}
diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp
index a671474..777bb85 100644
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.power@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.power@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/power/1.0/default/Android.bp b/power/1.0/default/Android.bp
index e573186..1a5a897 100644
--- a/power/1.0/default/Android.bp
+++ b/power/1.0/default/Android.bp
@@ -20,7 +20,8 @@
shared_libs: [
"liblog",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.power@1.0",
@@ -39,7 +40,8 @@
"libdl",
"libutils",
"libhardware",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"android.hardware.power@1.0",
],
diff --git a/power/1.0/vts/Android.mk b/power/1.0/vts/Android.mk
index 0dcc982..887b6bf 100644
--- a/power/1.0/vts/Android.mk
+++ b/power/1.0/vts/Android.mk
@@ -31,7 +31,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -64,7 +65,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp
index 0f89421..1bb8fe5 100644
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@@ -70,13 +70,15 @@
generated_headers: ["android.hardware.radio@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.radio@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/radio/1.0/IRadio.hal b/radio/1.0/IRadio.hal
index d2ffa82..f29b916 100644
--- a/radio/1.0/IRadio.hal
+++ b/radio/1.0/IRadio.hal
@@ -1556,4 +1556,12 @@
* Response callback is IRadioCallback.getAllowedCarriersResponse()
*/
oneway getAllowedCarriers(int32_t serial);
+
+ /*
+ * When response type received from a radio indication or radio response is
+ * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
+ * acknowledge the receipt of those messages by sending reseponeAcknowledgement().
+ *
+ */
+ oneway responseAcknowledgement();
};
\ No newline at end of file
diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp
index 2039613..7f25a62 100644
--- a/sensors/1.0/Android.bp
+++ b/sensors/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.sensors@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.sensors@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp
index d8d0c82..7fbe117 100644
--- a/sensors/1.0/default/Android.bp
+++ b/sensors/1.0/default/Android.bp
@@ -10,7 +10,8 @@
"libbase",
"libcutils",
"libutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"android.hardware.sensors@1.0",
],
static_libs: [
@@ -31,7 +32,8 @@
"libbase",
"libcutils",
"libutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"android.hardware.sensors@1.0",
],
local_include_dirs: ["include/sensors"],
diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk
index 4f418cb..b2b2c60 100644
--- a/sensors/1.0/default/Android.mk
+++ b/sensors/1.0/default/Android.mk
@@ -18,7 +18,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.sensors@1.0 \
include $(BUILD_EXECUTABLE)
diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp
index 79ae797..4eab0bf 100644
--- a/soundtrigger/2.0/Android.bp
+++ b/soundtrigger/2.0/Android.bp
@@ -46,14 +46,16 @@
generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.audio.common@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.audio.common@2.0",
diff --git a/soundtrigger/2.0/default/Android.mk b/soundtrigger/2.0/default/Android.mk
index 4ec64de..498c54f 100644
--- a/soundtrigger/2.0/default/Android.mk
+++ b/soundtrigger/2.0/default/Android.mk
@@ -23,7 +23,8 @@
SoundTriggerHalImpl.cpp
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
liblog \
libhwbinder \
libutils \
diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
index 97693fb..08947ad 100644
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -42,14 +42,16 @@
generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.tests.foo@1.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.tests.foo@1.0",
diff --git a/tests/bar/1.0/default/Android.bp b/tests/bar/1.0/default/Android.bp
index c2c2309..7e349c2 100644
--- a/tests/bar/1.0/default/Android.bp
+++ b/tests/bar/1.0/default/Android.bp
@@ -11,7 +11,8 @@
shared_libs: [
"libbase",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
diff --git a/tests/bar/1.0/default/Bar.cpp b/tests/bar/1.0/default/Bar.cpp
index 4ff9e6b..2158cd8 100644
--- a/tests/bar/1.0/default/Bar.cpp
+++ b/tests/bar/1.0/default/Bar.cpp
@@ -154,7 +154,7 @@
}
Return<void> Bar::expectNullHandle(const native_handle_t* h, const Abc& xyz, expectNullHandle_cb _hidl_cb) {
- ALOGI("SERVER(Bar) h = %p, xyz.z = %p", h, xyz.z);
+ ALOGI("SERVER(Bar) h = %p, xyz.z = %p", h, static_cast<void*>(xyz.z));
_hidl_cb(h == nullptr, xyz.z == nullptr);
return Void();
}
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
index 1a7c300..98d3e84 100644
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -54,13 +54,15 @@
generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
index 6acb3f9..60754d3 100644
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -42,13 +42,15 @@
generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index 7e30fe3..4064e74 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -70,13 +70,15 @@
generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/foo/1.0/default/Android.bp b/tests/foo/1.0/default/Android.bp
index f2ee521..76a4656 100644
--- a/tests/foo/1.0/default/Android.bp
+++ b/tests/foo/1.0/default/Android.bp
@@ -11,7 +11,8 @@
shared_libs: [
"libbase",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libfootest",
"libhwbinder",
"liblog",
diff --git a/tests/foo/1.0/default/lib/Android.bp b/tests/foo/1.0/default/lib/Android.bp
index c7ad57e..7873203 100644
--- a/tests/foo/1.0/default/lib/Android.bp
+++ b/tests/foo/1.0/default/lib/Android.bp
@@ -5,7 +5,8 @@
],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"android.hardware.tests.foo@1.0",
],
diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp
index f522ac0..cfd10ac 100644
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -58,13 +58,15 @@
generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/inheritance/1.0/default/Android.bp b/tests/inheritance/1.0/default/Android.bp
index d97bd83..638d3a4 100644
--- a/tests/inheritance/1.0/default/Android.bp
+++ b/tests/inheritance/1.0/default/Android.bp
@@ -11,7 +11,8 @@
shared_libs: [
"libbase",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
index 2598f30..ca02cc7 100644
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -34,13 +34,15 @@
generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/libhwbinder/1.0/default/Android.bp b/tests/libhwbinder/1.0/default/Android.bp
index 91149e8..73dcc61 100644
--- a/tests/libhwbinder/1.0/default/Android.bp
+++ b/tests/libhwbinder/1.0/default/Android.bp
@@ -7,10 +7,11 @@
shared_libs: [
"libbase",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.libhwbinder@1.0",
],
-}
\ No newline at end of file
+}
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index e685bcc..914c93f 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -34,13 +34,15 @@
generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
index ad8d014..bbd0eaa 100644
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -42,13 +42,15 @@
generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tests/pointer/1.0/default/Android.bp b/tests/pointer/1.0/default/Android.bp
index 081b7aa..f7180f1 100644
--- a/tests/pointer/1.0/default/Android.bp
+++ b/tests/pointer/1.0/default/Android.bp
@@ -10,7 +10,8 @@
shared_libs: [
"libbase",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libpointertest",
"libhwbinder",
"liblog",
diff --git a/tests/pointer/1.0/default/lib/Android.bp b/tests/pointer/1.0/default/lib/Android.bp
index efc61df..a7203c7 100644
--- a/tests/pointer/1.0/default/lib/Android.bp
+++ b/tests/pointer/1.0/default/lib/Android.bp
@@ -6,7 +6,8 @@
shared_libs: [
"libbase",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"liblog",
"android.hardware.tests.pointer@1.0",
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 60f2626..3b6ef06 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp
index 626dcaf..819f0b1 100644
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -10,7 +10,8 @@
"libbase",
"libcutils",
"libutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"android.hardware.thermal@1.0",
],
}
diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk
index fa7414e..9039e9f 100644
--- a/thermal/1.0/default/Android.mk
+++ b/thermal/1.0/default/Android.mk
@@ -33,7 +33,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.thermal@1.0 \
include $(BUILD_EXECUTABLE)
diff --git a/thermal/1.0/vts/Android.mk b/thermal/1.0/vts/Android.mk
index f1ac716..c4655b4 100644
--- a/thermal/1.0/vts/Android.mk
+++ b/thermal/1.0/vts/Android.mk
@@ -36,7 +36,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -71,7 +72,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp
index 7e0d1d0..fedb760 100644
--- a/thermal/1.0/vts/functional/Android.bp
+++ b/thermal/1.0/vts/functional/Android.bp
@@ -22,7 +22,8 @@
"libbase",
"liblog",
"libcutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libnativehelper",
"libutils",
diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp
index bb1ae82..02a4247 100644
--- a/tv/cec/1.0/Android.bp
+++ b/tv/cec/1.0/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/tv/cec/1.0/default/Android.mk b/tv/cec/1.0/default/Android.mk
index 3971f6c..492fc8c 100644
--- a/tv/cec/1.0/default/Android.mk
+++ b/tv/cec/1.0/default/Android.mk
@@ -7,7 +7,8 @@
HdmiCec.cpp
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
liblog \
libbase \
@@ -36,7 +37,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.tv.cec@1.0 \
include $(BUILD_EXECUTABLE)
diff --git a/tv/cec/1.0/default/HdmiCec.h b/tv/cec/1.0/default/HdmiCec.h
index 49237d5..a41a5f0 100644
--- a/tv/cec/1.0/default/HdmiCec.h
+++ b/tv/cec/1.0/default/HdmiCec.h
@@ -63,7 +63,7 @@
Return<void> enableAudioReturnChannel(int32_t portId, bool enable) override;
Return<bool> isConnected(int32_t portId) override;
- static void eventCallback(const hdmi_event_t* event, void* arg) {
+ static void eventCallback(const hdmi_event_t* event, void* /* arg */) {
if (mCallback != nullptr && event != nullptr) {
if (event->type == HDMI_EVENT_CEC_MESSAGE) {
size_t length = std::min(event->cec.length,
diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp
index 512634b..7f9bb7c 100644
--- a/tv/input/1.0/Android.bp
+++ b/tv/input/1.0/Android.bp
@@ -46,14 +46,16 @@
generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
"android.hardware.audio.common@2.0",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.audio.common@2.0",
diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk
index 520b0bf..9728015 100644
--- a/tv/input/1.0/default/Android.mk
+++ b/tv/input/1.0/default/Android.mk
@@ -10,7 +10,8 @@
libbase \
liblog \
libhardware \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
android.hardware.audio.common@2.0 \
@@ -36,7 +37,8 @@
LOCAL_SHARED_LIBRARIES += \
libhwbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
android.hardware.audio.common@2.0 \
android.hardware.tv.input@1.0 \
diff --git a/vehicle/2.0/Android.bp b/vehicle/2.0/Android.bp
index d51fe25..09025b9 100644
--- a/vehicle/2.0/Android.bp
+++ b/vehicle/2.0/Android.bp
@@ -46,13 +46,15 @@
generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],
export_generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/vehicle/2.0/default/Android.mk b/vehicle/2.0/default/Android.mk
index ccf18b6..46733e5d 100644
--- a/vehicle/2.0/default/Android.mk
+++ b/vehicle/2.0/default/Android.mk
@@ -28,7 +28,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
libbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
$(module_prefix) \
@@ -47,7 +48,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
libbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
$(module_prefix) \
@@ -73,7 +75,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
libbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
$(module_prefix) \
@@ -102,7 +105,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
libbinder \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libutils \
android.hardware.vehicle@2.0
diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp
index faf4341..bd88241 100644
--- a/vibrator/1.0/Android.bp
+++ b/vibrator/1.0/Android.bp
@@ -38,13 +38,15 @@
generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/vibrator/1.0/default/Android.bp b/vibrator/1.0/default/Android.bp
index 4dd00dd..5e488e6 100644
--- a/vibrator/1.0/default/Android.bp
+++ b/vibrator/1.0/default/Android.bp
@@ -17,7 +17,8 @@
relative_install_path: "hw",
srcs: ["Vibrator.cpp"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"liblog",
"libhwbinder",
"libutils",
diff --git a/vibrator/1.0/default/Android.mk b/vibrator/1.0/default/Android.mk
index 2b168bb..5ba334b 100644
--- a/vibrator/1.0/default/Android.mk
+++ b/vibrator/1.0/default/Android.mk
@@ -24,7 +24,8 @@
service.cpp \
LOCAL_SHARED_LIBRARIES := \
- libhidl \
+ libhidlbase \
+ libhidltransport \
liblog \
libhwbinder \
libutils \
diff --git a/vibrator/1.0/vts/Android.mk b/vibrator/1.0/vts/Android.mk
index 750c929..2f612d5 100644
--- a/vibrator/1.0/vts/Android.mk
+++ b/vibrator/1.0/vts/Android.mk
@@ -31,7 +31,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -64,7 +65,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp
index fc4619f..5cbd333 100644
--- a/vr/1.0/Android.bp
+++ b/vr/1.0/Android.bp
@@ -34,13 +34,15 @@
generated_headers: ["android.hardware.vr@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.vr@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/vr/1.0/default/Android.bp b/vr/1.0/default/Android.bp
index 09b0002..d100570 100644
--- a/vr/1.0/default/Android.bp
+++ b/vr/1.0/default/Android.bp
@@ -10,7 +10,8 @@
"libbase",
"libcutils",
"libutils",
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"android.hardware.vr@1.0",
],
}
diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk
index 93f8546..12f0175 100644
--- a/vr/1.0/vts/Android.mk
+++ b/vr/1.0/vts/Android.mk
@@ -30,7 +30,8 @@
libutils \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
@@ -62,7 +63,8 @@
libbase \
libcutils \
liblog \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
libprotobuf-cpp-full \
libvts_common \
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index da9210c..d353e4b 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -134,13 +134,15 @@
generated_headers: ["android.hardware.wifi@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.wifi@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],
diff --git a/wifi/1.0/default/Android.mk b/wifi/1.0/default/Android.mk
index e84124e..646613b 100644
--- a/wifi/1.0/default/Android.mk
+++ b/wifi/1.0/default/Android.mk
@@ -32,7 +32,8 @@
android.hardware.wifi@1.0 \
libbase \
libcutils \
- libhidl \
+ libhidlbase \
+ libhidltransport \
libhwbinder \
liblog \
libnl \
diff --git a/wifi/1.0/default/wifi.cpp b/wifi/1.0/default/wifi.cpp
index fd2cb9c..3475c46 100644
--- a/wifi/1.0/default/wifi.cpp
+++ b/wifi/1.0/default/wifi.cpp
@@ -33,7 +33,8 @@
using hidl_return_util::validateAndCall;
Wifi::Wifi()
- : legacy_hal_(new WifiLegacyHal()), run_state_(RunState::STOPPED) {}
+ : legacy_hal_(new legacy_hal::WifiLegacyHal()),
+ run_state_(RunState::STOPPED) {}
bool Wifi::isValid() {
// This object is always valid.
diff --git a/wifi/1.0/default/wifi.h b/wifi/1.0/default/wifi.h
index c682116..7872303 100644
--- a/wifi/1.0/default/wifi.h
+++ b/wifi/1.0/default/wifi.h
@@ -64,7 +64,7 @@
// Instance is created in this root level |IWifi| HIDL interface object
// and shared with all the child HIDL interface objects.
- std::shared_ptr<WifiLegacyHal> legacy_hal_;
+ std::shared_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
RunState run_state_;
std::vector<sp<IWifiEventCallback>> event_callbacks_;
sp<WifiChip> chip_;
diff --git a/wifi/1.0/default/wifi_ap_iface.cpp b/wifi/1.0/default/wifi_ap_iface.cpp
index 8c38946..b8b7a3a 100644
--- a/wifi/1.0/default/wifi_ap_iface.cpp
+++ b/wifi/1.0/default/wifi_ap_iface.cpp
@@ -27,8 +27,9 @@
namespace implementation {
using hidl_return_util::validateAndCall;
-WifiApIface::WifiApIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal)
+WifiApIface::WifiApIface(
+ const std::string& ifname,
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiApIface::invalidate() {
diff --git a/wifi/1.0/default/wifi_ap_iface.h b/wifi/1.0/default/wifi_ap_iface.h
index 458bdda..ee5dc56 100644
--- a/wifi/1.0/default/wifi_ap_iface.h
+++ b/wifi/1.0/default/wifi_ap_iface.h
@@ -34,7 +34,7 @@
class WifiApIface : public IWifiApIface {
public:
WifiApIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal);
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -49,7 +49,7 @@
std::pair<WifiStatus, IfaceType> getTypeInternal();
std::string ifname_;
- std::weak_ptr<WifiLegacyHal> legacy_hal_;
+ std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
bool is_valid_;
DISALLOW_COPY_AND_ASSIGN(WifiApIface);
diff --git a/wifi/1.0/default/wifi_chip.cpp b/wifi/1.0/default/wifi_chip.cpp
index 2245288..4d1bce5 100644
--- a/wifi/1.0/default/wifi_chip.cpp
+++ b/wifi/1.0/default/wifi_chip.cpp
@@ -42,7 +42,7 @@
using hidl_return_util::validateAndCall;
WifiChip::WifiChip(ChipId chip_id,
- const std::weak_ptr<WifiLegacyHal> legacy_hal)
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: chip_id_(chip_id), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiChip::invalidate() {
diff --git a/wifi/1.0/default/wifi_chip.h b/wifi/1.0/default/wifi_chip.h
index 0c8adac..c1a7173 100644
--- a/wifi/1.0/default/wifi_chip.h
+++ b/wifi/1.0/default/wifi_chip.h
@@ -42,7 +42,8 @@
*/
class WifiChip : public IWifiChip {
public:
- WifiChip(ChipId chip_id, const std::weak_ptr<WifiLegacyHal> legacy_hal);
+ WifiChip(ChipId chip_id,
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// HIDL does not provide a built-in mechanism to let the server invalidate
// a HIDL interface object after creation. If any client process holds onto
// a reference to the object in their context, any method calls on that
@@ -154,7 +155,7 @@
getDebugHostWakeReasonStatsInternal();
ChipId chip_id_;
- std::weak_ptr<WifiLegacyHal> legacy_hal_;
+ std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiChipEventCallback>> event_callbacks_;
sp<WifiApIface> ap_iface_;
sp<WifiNanIface> nan_iface_;
diff --git a/wifi/1.0/default/wifi_legacy_hal.cpp b/wifi/1.0/default/wifi_legacy_hal.cpp
index cb254c3..28b7f9a 100644
--- a/wifi/1.0/default/wifi_legacy_hal.cpp
+++ b/wifi/1.0/default/wifi_legacy_hal.cpp
@@ -16,14 +16,19 @@
#include <array>
-#include "wifi_legacy_hal.h"
-
#include <android-base/logging.h>
#include <cutils/properties.h>
-#include <wifi_system/hal_tool.h>
#include <wifi_system/interface_tool.h>
-namespace {
+#include "wifi_legacy_hal.h"
+
+namespace android {
+namespace hardware {
+namespace wifi {
+namespace V1_0 {
+namespace implementation {
+namespace legacy_hal {
+// Constants used in the class.
static constexpr uint32_t kMaxVersionStringLength = 256;
// Legacy HAL functions accept "C" style function pointers, so use global
@@ -52,13 +57,8 @@
on_firmware_memory_dump_internal_callback(buffer, buffer_size);
}
}
-}
+// End of the free-standing "C" style callbacks.
-namespace android {
-namespace hardware {
-namespace wifi {
-namespace V1_0 {
-namespace implementation {
WifiLegacyHal::WifiLegacyHal()
: global_handle_(nullptr),
wlan_interface_handle_(nullptr),
@@ -69,9 +69,11 @@
CHECK(!global_handle_ && !wlan_interface_handle_ &&
!awaiting_event_loop_termination_);
- android::wifi_system::HalTool hal_tool;
android::wifi_system::InterfaceTool if_tool;
- if (!hal_tool.InitFunctionTable(&global_func_table_)) {
+ // TODO: Add back the HAL Tool if we need to. All we need from the HAL tool
+ // for now is this function call which we can directly call.
+ wifi_error status = init_wifi_vendor_hal_func_table(&global_func_table_);
+ if (status != WIFI_SUCCESS) {
LOG(ERROR) << "Failed to initialize legacy hal function table";
return WIFI_ERROR_UNKNOWN;
}
@@ -81,7 +83,7 @@
}
LOG(INFO) << "Starting legacy HAL";
- wifi_error status = global_func_table_.wifi_initialize(&global_handle_);
+ status = global_func_table_.wifi_initialize(&global_handle_);
if (status != WIFI_SUCCESS || !global_handle_) {
LOG(ERROR) << "Failed to retrieve global handle";
return status;
@@ -141,7 +143,7 @@
buffer.fill(0);
wifi_error status = global_func_table_.wifi_get_driver_version(
wlan_interface_handle_, buffer.data(), buffer.size());
- return std::make_pair(status, buffer.data());
+ return {status, buffer.data()};
}
std::pair<wifi_error, std::string> WifiLegacyHal::getFirmwareVersion() {
@@ -149,7 +151,7 @@
buffer.fill(0);
wifi_error status = global_func_table_.wifi_get_firmware_version(
wlan_interface_handle_, buffer.data(), buffer.size());
- return std::make_pair(status, buffer.data());
+ return {status, buffer.data()};
}
std::pair<wifi_error, std::vector<uint8_t>>
@@ -164,7 +166,7 @@
wifi_error status = global_func_table_.wifi_get_driver_memory_dump(
wlan_interface_handle_, {onDriverMemoryDump});
on_driver_memory_dump_internal_callback = nullptr;
- return std::make_pair(status, std::move(driver_dump));
+ return {status, std::move(driver_dump)};
}
std::pair<wifi_error, std::vector<uint8_t>>
@@ -179,7 +181,29 @@
wifi_error status = global_func_table_.wifi_get_firmware_memory_dump(
wlan_interface_handle_, {onFirmwareMemoryDump});
on_firmware_memory_dump_internal_callback = nullptr;
- return std::make_pair(status, std::move(firmware_dump));
+ return {status, std::move(firmware_dump)};
+}
+
+std::pair<wifi_error, uint32_t> WifiLegacyHal::getSupportedFeatureSet() {
+ feature_set set;
+ static_assert(sizeof(set) == sizeof(uint32_t),
+ "Some features can not be represented in output");
+ wifi_error status = global_func_table_.wifi_get_supported_feature_set(
+ wlan_interface_handle_, &set);
+ return {status, static_cast<uint32_t>(set)};
+}
+
+std::pair<wifi_error, PacketFilterCapabilities>
+WifiLegacyHal::getPacketFilterCapabilities() {
+ PacketFilterCapabilities caps;
+ wifi_error status = global_func_table_.wifi_get_packet_filter_capabilities(
+ wlan_interface_handle_, &caps.version, &caps.max_len);
+ return {status, caps};
+}
+
+wifi_error WifiLegacyHal::setPacketFilter(const std::vector<uint8_t>& program) {
+ return global_func_table_.wifi_set_packet_filter(
+ wlan_interface_handle_, program.data(), program.size());
}
wifi_error WifiLegacyHal::retrieveWlanInterfaceHandle() {
@@ -228,6 +252,8 @@
on_driver_memory_dump_internal_callback = nullptr;
on_firmware_memory_dump_internal_callback = nullptr;
}
+
+} // namespace legacy_hal
} // namespace implementation
} // namespace V1_0
} // namespace wifi
diff --git a/wifi/1.0/default/wifi_legacy_hal.h b/wifi/1.0/default/wifi_legacy_hal.h
index d817184..8bd146a 100644
--- a/wifi/1.0/default/wifi_legacy_hal.h
+++ b/wifi/1.0/default/wifi_legacy_hal.h
@@ -21,13 +21,23 @@
#include <thread>
#include <vector>
-#include <hardware_legacy/wifi_hal.h>
-
namespace android {
namespace hardware {
namespace wifi {
namespace V1_0 {
namespace implementation {
+// This is in a separate namespace to prevent typename conflicts between
+// the legacy HAL types and the HIDL interface types.
+namespace legacy_hal {
+// Wrap all the types defined inside the legacy HAL header files inside this
+// namespace.
+#include <hardware_legacy/wifi_hal.h>
+
+// APF capabilities supported by the iface.
+struct PacketFilterCapabilities {
+ uint32_t version;
+ uint32_t max_len;
+};
/**
* Class that encapsulates all legacy HAL interactions.
@@ -51,6 +61,10 @@
std::pair<wifi_error, std::string> getFirmwareVersion();
std::pair<wifi_error, std::vector<uint8_t>> requestDriverMemoryDump();
std::pair<wifi_error, std::vector<uint8_t>> requestFirmwareMemoryDump();
+ std::pair<wifi_error, uint32_t> getSupportedFeatureSet();
+ // APF functions.
+ std::pair<wifi_error, PacketFilterCapabilities> getPacketFilterCapabilities();
+ wifi_error setPacketFilter(const std::vector<uint8_t>& program);
private:
// Retrieve the interface handle to be used for the "wlan" interface.
@@ -71,6 +85,7 @@
bool awaiting_event_loop_termination_;
};
+} // namespace legacy_hal
} // namespace implementation
} // namespace V1_0
} // namespace wifi
diff --git a/wifi/1.0/default/wifi_nan_iface.cpp b/wifi/1.0/default/wifi_nan_iface.cpp
index a2190a8..48e75a5 100644
--- a/wifi/1.0/default/wifi_nan_iface.cpp
+++ b/wifi/1.0/default/wifi_nan_iface.cpp
@@ -27,8 +27,9 @@
namespace implementation {
using hidl_return_util::validateAndCall;
-WifiNanIface::WifiNanIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal)
+WifiNanIface::WifiNanIface(
+ const std::string& ifname,
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiNanIface::invalidate() {
diff --git a/wifi/1.0/default/wifi_nan_iface.h b/wifi/1.0/default/wifi_nan_iface.h
index f3c0640..4f89b31 100644
--- a/wifi/1.0/default/wifi_nan_iface.h
+++ b/wifi/1.0/default/wifi_nan_iface.h
@@ -35,7 +35,7 @@
class WifiNanIface : public IWifiNanIface {
public:
WifiNanIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal);
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -135,7 +135,7 @@
WifiStatus dataEndInternal(uint32_t cmd_id, const NanDataPathEndRequest& msg);
std::string ifname_;
- std::weak_ptr<WifiLegacyHal> legacy_hal_;
+ std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiNanIfaceEventCallback>> event_callbacks_;
bool is_valid_;
diff --git a/wifi/1.0/default/wifi_p2p_iface.cpp b/wifi/1.0/default/wifi_p2p_iface.cpp
index 65258ba..0d055f1 100644
--- a/wifi/1.0/default/wifi_p2p_iface.cpp
+++ b/wifi/1.0/default/wifi_p2p_iface.cpp
@@ -27,8 +27,9 @@
namespace implementation {
using hidl_return_util::validateAndCall;
-WifiP2pIface::WifiP2pIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal)
+WifiP2pIface::WifiP2pIface(
+ const std::string& ifname,
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiP2pIface::invalidate() {
diff --git a/wifi/1.0/default/wifi_p2p_iface.h b/wifi/1.0/default/wifi_p2p_iface.h
index d4656e1..d2982db 100644
--- a/wifi/1.0/default/wifi_p2p_iface.h
+++ b/wifi/1.0/default/wifi_p2p_iface.h
@@ -34,7 +34,7 @@
class WifiP2pIface : public IWifiP2pIface {
public:
WifiP2pIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal);
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -49,7 +49,7 @@
std::pair<WifiStatus, IfaceType> getTypeInternal();
std::string ifname_;
- std::weak_ptr<WifiLegacyHal> legacy_hal_;
+ std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
bool is_valid_;
DISALLOW_COPY_AND_ASSIGN(WifiP2pIface);
diff --git a/wifi/1.0/default/wifi_rtt_controller.cpp b/wifi/1.0/default/wifi_rtt_controller.cpp
index dbe836b..6ac0629 100644
--- a/wifi/1.0/default/wifi_rtt_controller.cpp
+++ b/wifi/1.0/default/wifi_rtt_controller.cpp
@@ -29,7 +29,7 @@
WifiRttController::WifiRttController(
const sp<IWifiIface>& bound_iface,
- const std::weak_ptr<WifiLegacyHal> legacy_hal)
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: bound_iface_(bound_iface), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiRttController::invalidate() {
diff --git a/wifi/1.0/default/wifi_rtt_controller.h b/wifi/1.0/default/wifi_rtt_controller.h
index 5ebd4bc..3dd5340 100644
--- a/wifi/1.0/default/wifi_rtt_controller.h
+++ b/wifi/1.0/default/wifi_rtt_controller.h
@@ -36,7 +36,7 @@
class WifiRttController : public IWifiRttController {
public:
WifiRttController(const sp<IWifiIface>& bound_iface,
- const std::weak_ptr<WifiLegacyHal> legacy_hal);
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -103,7 +103,7 @@
WifiStatus disableResponderInternal(uint32_t cmd_id);
sp<IWifiIface> bound_iface_;
- std::weak_ptr<WifiLegacyHal> legacy_hal_;
+ std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiRttControllerEventCallback>> event_callbacks_;
bool is_valid_;
diff --git a/wifi/1.0/default/wifi_sta_iface.cpp b/wifi/1.0/default/wifi_sta_iface.cpp
index 1f220f3..6365032 100644
--- a/wifi/1.0/default/wifi_sta_iface.cpp
+++ b/wifi/1.0/default/wifi_sta_iface.cpp
@@ -27,8 +27,9 @@
namespace implementation {
using hidl_return_util::validateAndCall;
-WifiStaIface::WifiStaIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal)
+WifiStaIface::WifiStaIface(
+ const std::string& ifname,
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiStaIface::invalidate() {
diff --git a/wifi/1.0/default/wifi_sta_iface.h b/wifi/1.0/default/wifi_sta_iface.h
index a13feeb..09a883c 100644
--- a/wifi/1.0/default/wifi_sta_iface.h
+++ b/wifi/1.0/default/wifi_sta_iface.h
@@ -35,7 +35,7 @@
class WifiStaIface : public IWifiStaIface {
public:
WifiStaIface(const std::string& ifname,
- const std::weak_ptr<WifiLegacyHal> legacy_hal);
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -107,7 +107,7 @@
getDebugRxPacketFatesInternal();
std::string ifname_;
- std::weak_ptr<WifiLegacyHal> legacy_hal_;
+ std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiStaIfaceEventCallback>> event_callbacks_;
bool is_valid_;
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
index 08c6f9a..0f399a0 100644
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -126,13 +126,15 @@
generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],
shared_libs: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
"libcutils",
],
export_shared_lib_headers: [
- "libhidl",
+ "libhidlbase",
+ "libhidltransport",
"libhwbinder",
"libutils",
],