Merge changes from topic "presubmit-am-b22a13ff4f3e489f907abff6d4526cb4" into udc-dev
* changes:
[automerge] Add min uwb initiation time as new vendor capability. 2p: 2f83e56e61
Add min uwb initiation time as new vendor capability.
diff --git a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
index 8a3ab90..19c3376 100644
--- a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
+++ b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
@@ -873,7 +873,17 @@
HVAC_DUAL_ON = 0x0509 + 0x10000000 + 0x05000000
+ 0x00200000, // VehiclePropertyGroup:SYSTEM,VehicleArea:SEAT,VehiclePropertyType:BOOLEAN
/**
- * On/off automatic mode
+ * On/off automatic climate control.
+ *
+ * If true, automatic climate control is on. If false, automatic climate control is off.
+ *
+ * If the vehicle does not support directly turning off automatic climate control, then OEMs
+ * should add logic in their VHAL implementation so that setting HVAC_AUTO_ON to false would
+ * change the necessary HVAC settings to indirectly turn off HVAC_AUTO_ON. Ideally, this should
+ * not be disruptive to the user, so OEMs should change back to the previous state any settings
+ * that were modified once automatic climate control is off. That way the only outcome should be
+ * that HVAC_AUTO_ON is off. If restoring the HVAC settings to its previous settings is not
+ * possible, then the OEM should choose the least disruptive change and implement that.
*
* This property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to
* implement it as VehiclePropertyAccess.READ only.
diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp
index c315879..fd41335 100644
--- a/camera/provider/aidl/vts/camera_aidl_test.cpp
+++ b/camera/provider/aidl/vts/camera_aidl_test.cpp
@@ -336,7 +336,7 @@
int retcode = find_camera_metadata_ro_entry(metadata,
ANDROID_CONTROL_AVAILABLE_SETTINGS_OVERRIDES, &entry);
bool supportSettingsOverride = false;
- if ((0 == retcode) && (entry.count > 0)) {
+ if (0 == retcode) {
supportSettingsOverride = true;
bool hasOff = false;
for (size_t i = 0; i < entry.count; i++) {
diff --git a/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerCommandEngine.h b/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerCommandEngine.h
index ab67eb1..9ae6173 100644
--- a/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerCommandEngine.h
+++ b/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerCommandEngine.h
@@ -207,7 +207,7 @@
bool executeSetClientTarget(uint16_t length) {
// 4 parameters followed by N rectangles
- if ((length - 4) % 4 != 0) {
+ if (!length || (length - 4) % 4 != 0) {
return false;
}