Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b419327f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12378824 from 636cba87 to 24Q4-release

Change-Id: I0f24d57ec7ff77211e4a628536aa27ee32bd539e
parents 6f25be7e 636cba87
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
{
    "ravenwood-presubmit": [
        {
            "name": "CarServiceHostUnitTest",
            "host": true
        }
    ]
}
+12 −9
Original line number Diff line number Diff line
@@ -3195,19 +3195,22 @@
            }
        },
        {
            "property": "VehicleProperty::DISPLAY_BRIGHTNESS",
            "property": "VehicleProperty::PER_DISPLAY_BRIGHTNESS"
        },
        {
            "property": "VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS",
            "defaultValue": {
                "int32Values": [
                    0,
                    100,
                    1,
                    100,
                    2,
                    100,
                    3,
                    100
                ]
            },
            "areas": [
                {
                    "areaId": 0,
                    "minInt32Value": 0,
                    "maxInt32Value": 100
            }
            ]
        },
        {
            "property": "VehicleProperty::VALET_MODE_ENABLED",
+4 −0
Original line number Diff line number Diff line
@@ -1050,6 +1050,10 @@ VhalResult<void> FakeVehicleHardware::maybeSetSpecialValue(const VehiclePropValu
    VhalResult<void> isAdasPropertyAvailableResult;
    VhalResult<bool> isCruiseControlTypeStandardResult;
    switch (propId) {
        case toInt(VehicleProperty::DISPLAY_BRIGHTNESS):
        case toInt(VehicleProperty::PER_DISPLAY_BRIGHTNESS):
            ALOGD("DISPLAY_BRIGHTNESS: %s", value.toString().c_str());
            return {};
        case toInt(VehicleProperty::AP_POWER_STATE_REPORT):
            *isSpecialValue = true;
            return setApPowerStateReport(value);
+15 −20
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ TEST_P(CameraAidlTest, getResourceCost) {

// Validate the integrity of manual flash strength control metadata
TEST_P(CameraAidlTest, validateManualFlashStrengthControlKeys) {
    if (flags::camera_manual_flash_strength_control()) {
    std::vector<std::string> cameraDeviceNames = getCameraDeviceNames(mProvider);
    for (const auto& name : cameraDeviceNames) {
        ALOGI("validateManualFlashStrengthControlKeys: Testing camera device %s", name.c_str());
@@ -182,10 +181,6 @@ TEST_P(CameraAidlTest, validateManualFlashStrengthControlKeys) {
        mSession = nullptr;
        ASSERT_TRUE(ret.isOk());
    }
    } else {
        ALOGI("validateManualFlashStrengthControlKeys: Test skipped.\n");
        GTEST_SKIP();
    }
}

TEST_P(CameraAidlTest, systemCameraTest) {
+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@
#warn "ComposerCommandBuffer.h included without LOG_TAG"
#endif

#undef LOG_NDEBUG
#define LOG_NDEBUG 0
//#define LOG_NDEBUG 0

#include <algorithm>
#include <limits>
Loading