Merge "omx: validate only standard OMX roles" into android12-tests-dev
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 7727547..8e7180f 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1602,9 +1602,10 @@
w = stream.bufferSize;
h = 1;
}
- mParent->allocateGraphicBuffer(w, h,
- android_convertGralloc1To0Usage(
- halStream.producerUsage, halStream.consumerUsage),
+ mParent->allocateGraphicBuffer(
+ w, h,
+ (uint32_t)android_convertGralloc1To0Usage(halStream.producerUsage,
+ halStream.consumerUsage),
halStream.overrideFormat, &buffer_handle);
tmpRetBuffers[j] = {stream.v3_2.id, mNextBufferId, buffer_handle, BufferStatus::OK,
@@ -4675,7 +4676,7 @@
/* We don't look at halStreamConfig.streams[0].consumerUsage
* since that is 0 for output streams
*/
- android_convertGralloc1To0Usage(
+ (uint32_t)android_convertGralloc1To0Usage(
halStreamConfig.streams[0].producerUsage, bufferUsage),
halStreamConfig.streams[0].overrideFormat, &buffer_handle);
outputBuffer = {halStreamConfig.streams[0].id,
@@ -4897,9 +4898,10 @@
BufferStatus::OK, nullptr, nullptr};
} else {
allocateGraphicBuffer(previewStream.width, previewStream.height,
- android_convertGralloc1To0Usage(halStream.v3_3.v3_2.producerUsage,
- halStream.v3_3.v3_2.consumerUsage),
- halStream.v3_3.v3_2.overrideFormat, &buffer_handle);
+ (uint32_t)android_convertGralloc1To0Usage(
+ halStream.v3_3.v3_2.producerUsage,
+ halStream.v3_3.v3_2.consumerUsage),
+ halStream.v3_3.v3_2.overrideFormat, &buffer_handle);
graphicBuffers.push_back(buffer_handle);
outputBuffers[k] = {halStream.v3_3.v3_2.id, bufferId, buffer_handle,
BufferStatus::OK, nullptr, nullptr};
@@ -5288,9 +5290,10 @@
nullptr, BufferStatus::OK, nullptr, nullptr};
} else {
allocateGraphicBuffer(previewStream.width, previewStream.height,
- android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,
- halStreamConfig.streams[0].consumerUsage),
- halStreamConfig.streams[0].overrideFormat, &buffers[i]);
+ (uint32_t)android_convertGralloc1To0Usage(
+ halStreamConfig.streams[0].producerUsage,
+ halStreamConfig.streams[0].consumerUsage),
+ halStreamConfig.streams[0].overrideFormat, &buffers[i]);
outputBuffers[i] = {halStreamConfig.streams[0].id, bufferId + i,
buffers[i], BufferStatus::OK, nullptr, nullptr};
}
@@ -5394,9 +5397,10 @@
bufferId = 0;
} else {
allocateGraphicBuffer(previewStream.width, previewStream.height,
- android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,
- halStreamConfig.streams[0].consumerUsage),
- halStreamConfig.streams[0].overrideFormat, &buffer_handle);
+ (uint32_t)android_convertGralloc1To0Usage(
+ halStreamConfig.streams[0].producerUsage,
+ halStreamConfig.streams[0].consumerUsage),
+ halStreamConfig.streams[0].overrideFormat, &buffer_handle);
}
StreamBuffer outputBuffer = {halStreamConfig.streams[0].id,
@@ -5517,9 +5521,10 @@
buffers[i], BufferStatus::OK, nullptr, nullptr};
} else {
// jpeg buffer (w,h) = (blobLen, 1)
- allocateGraphicBuffer(jpegBufferSize, /*height*/1,
- android_convertGralloc1To0Usage(halStreamConfig3_2.producerUsage,
- halStreamConfig3_2.consumerUsage),
+ allocateGraphicBuffer(
+ jpegBufferSize, /*height*/ 1,
+ (uint32_t)android_convertGralloc1To0Usage(halStreamConfig3_2.producerUsage,
+ halStreamConfig3_2.consumerUsage),
halStreamConfig3_2.overrideFormat, &buffers[i]);
outputBuffers[i] = {halStreamConfig3_2.id, bufferId + i,
buffers[i], BufferStatus::OK, nullptr, nullptr};
@@ -5761,9 +5766,10 @@
bufferId = 0;
} else {
allocateGraphicBuffer(previewStream.width, previewStream.height,
- android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,
- halStreamConfig.streams[0].consumerUsage),
- halStreamConfig.streams[0].overrideFormat, &buffer_handle);
+ (uint32_t)android_convertGralloc1To0Usage(
+ halStreamConfig.streams[0].producerUsage,
+ halStreamConfig.streams[0].consumerUsage),
+ halStreamConfig.streams[0].overrideFormat, &buffer_handle);
}
StreamBuffer outputBuffer = {halStreamConfig.streams[0].id,
diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
index 8cb7e22..4fb324d 100644
--- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
+++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
@@ -72,10 +72,6 @@
// Helper function to initialize the driver and firmware to STA mode
// using the vendor HAL HIDL interface.
void initilializeDriverAndFirmware(const std::string& wifi_instance_name) {
- // Skip if wifi instance is not set.
- if (wifi_instance_name == "") {
- return;
- }
if (getWifi(wifi_instance_name) != nullptr) {
sp<IWifiChip> wifi_chip = getWifiChip(wifi_instance_name);
ChipModeId mode_id;
@@ -89,10 +85,6 @@
// Helper function to deinitialize the driver and firmware
// using the vendor HAL HIDL interface.
void deInitilializeDriverAndFirmware(const std::string& wifi_instance_name) {
- // Skip if wifi instance is not set.
- if (wifi_instance_name == "") {
- return;
- }
if (getWifi(wifi_instance_name) != nullptr) {
stopWifi(wifi_instance_name);
} else {