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

Commit 7e5c3f02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Fix insensitive language in comments and names" into rvc-dev

parents fda88150 d6346872

camera/device/3.2/default/convert.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ bool convertFromHidl(const CameraMetadata &src, const camera_metadata_t** dst) { 
    }



    const uint8_t* data = src.data();

    // sanity check the size of CameraMetadata match underlying camera_metadata_t

    // check that the size of CameraMetadata match underlying camera_metadata_t

    if (get_camera_metadata_size((camera_metadata_t*)data) != src.size()) {

        ALOGE("%s: input CameraMetadata is corrupt!", __FUNCTION__);

        return false;

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1894,7 +1894,7 @@ TEST_P(CameraHidlTest, getCameraDeviceInterface) { 
}



// Verify that the device resource cost can be retrieved and the values are

// sane.

// correct.

TEST_P(CameraHidlTest, getResourceCost) {

    hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);
@@ -2544,7 +2544,7 @@ TEST_P(CameraHidlTest, sendCommandSmoothZoom) { 
    }

}



// Basic sanity tests related to camera parameters.

// Basic correctness tests related to camera parameters.

TEST_P(CameraHidlTest, getSetParameters) {

    hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);