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

Commit cb877f95 authored by Changyeon Jo's avatar Changyeon Jo
Browse files

Use more inclusive terms 

Updating language to comply with the inclusive language guidance

Bug: 162326641
Test: m -j
Change-Id: I627c22c3a0f89879255f1c65cfa314aebc70417e
parent 44319359

automotive/evs/1.0/default/EvsCamera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ EvsCamera::EvsCamera(const char *id) : 


    mDescription.cameraId = id;



    // Set up dummy data for testing

    // Set up mock data for testing

    if (mDescription.cameraId == kCameraName_Backup) {

        mWidth  = 640;          // full NTSC/VGA

        mHeight = 480;          // full NTSC/VGA

automotive/evs/1.0/vts/functional/VtsHalEvsV1_0TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ TEST_P(EvsHidlTest, CameraStreamPerformance) { 
TEST_P(EvsHidlTest, CameraStreamBuffering) {

    ALOGI("Starting CameraStreamBuffering test");



    // Arbitrary constant (should be > 1 and less than crazy)

    // Arbitrary constant (should be > 1 and not too big)

    static const unsigned int kBuffersToHold = 6;



    // Get the camera list
@@ -381,7 +381,7 @@ TEST_P(EvsHidlTest, CameraStreamBuffering) { 
        sp<IEvsCamera> pCam = pEnumerator->openCamera(cam.cameraId);

        ASSERT_NE(pCam, nullptr);



        // Ask for a crazy number of buffers in flight to ensure it errors correctly

        // Ask for a very large number of buffers in flight to ensure it errors correctly

        Return<EvsResult> badResult = pCam->setMaxFramesInFlight(0xFFFFFFFF);

        EXPECT_EQ(EvsResult::BUFFER_NOT_AVAILABLE, badResult);

automotive/evs/1.1/default/ConfigManager.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public: 
        }



        /*

         * List of supported controls that the master client can program.

         * List of supported controls that the primary client can program.

         * Paraemters are stored with its valid range

         */

        unordered_map<CameraParam,

automotive/evs/1.1/default/EvsEnumerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ EvsEnumerator::EvsEnumerator(sp<IAutomotiveDisplayProxyService> windowService) { 


    // Add ultrasonics array desc.

    sUltrasonicsArrayRecordList.emplace_back(

            EvsUltrasonicsArray::GetDummyArrayDesc("front_array"));

            EvsUltrasonicsArray::GetMockArrayDesc("front_array"));

}

automotive/evs/1.1/default/EvsUltrasonicsArray.cpp

+14 −14
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ const int kTargetFrameRate = 10; 


namespace {



void fillDummyArrayDesc(UltrasonicsArrayDesc& arrayDesc) {

void fillMockArrayDesc(UltrasonicsArrayDesc& arrayDesc) {

    arrayDesc.maxReadingsPerSensorCount = kMaxReadingsPerSensor;

    arrayDesc.maxReceiversCount = kMaxReceiversCount;
@@ -99,8 +99,8 @@ void SerializeWaveformData(const std::vector<WaveformData>& waveformDataList, ui 
    }

}



// Fills dataFrameDesc with dummy data.

bool fillDummyDataFrame(UltrasonicsDataFrameDesc& dataFrameDesc, sp<IMemory> pIMemory) {

// Fills dataFrameDesc with mock data.

bool fillMockDataFrame(UltrasonicsDataFrameDesc& dataFrameDesc, sp<IMemory> pIMemory) {

    dataFrameDesc.timestampNs = elapsedRealtimeNano();



    const std::vector<uint8_t> transmittersIdList = {0};
@@ -137,9 +137,9 @@ EvsUltrasonicsArray::EvsUltrasonicsArray(const char* deviceName) 
    : mFramesAllowed(0), mFramesInUse(0), mStreamState(STOPPED) {

    LOG(DEBUG) << "EvsUltrasonicsArray instantiated";



    // Set up dummy data for description.

    // Set up mock data for description.

    mArrayDesc.ultrasonicsArrayId = deviceName;

    fillDummyArrayDesc(mArrayDesc);

    fillMockArrayDesc(mArrayDesc);



    // Assign allocator.

    mShmemAllocator = IAllocator::getService("ashmem");
@@ -182,10 +182,10 @@ void EvsUltrasonicsArray::forceShutdown() { 
    mStreamState = DEAD;

}



UltrasonicsArrayDesc EvsUltrasonicsArray::GetDummyArrayDesc(const char* deviceName) {

UltrasonicsArrayDesc EvsUltrasonicsArray::GetMockArrayDesc(const char* deviceName) {

    UltrasonicsArrayDesc ultrasonicsArrayDesc;

    ultrasonicsArrayDesc.ultrasonicsArrayId = deviceName;

    fillDummyArrayDesc(ultrasonicsArrayDesc);

    fillMockArrayDesc(ultrasonicsArrayDesc);

    return ultrasonicsArrayDesc;

}
@@ -497,17 +497,17 @@ void EvsUltrasonicsArray::generateDataFrames() { 


        if (timeForFrame) {

            // Assemble the buffer description we'll transmit below

            UltrasonicsDataFrameDesc dummyDataFrameDesc;

            dummyDataFrameDesc.dataFrameId = idx;

            dummyDataFrameDesc.waveformsData = mDataFrames[idx].sharedMemory.hidlMemory;

            UltrasonicsDataFrameDesc mockDataFrameDesc;

            mockDataFrameDesc.dataFrameId = idx;

            mockDataFrameDesc.waveformsData = mDataFrames[idx].sharedMemory.hidlMemory;



            // Fill dummy waveform data.

            fillDummyDataFrame(dummyDataFrameDesc, mDataFrames[idx].sharedMemory.pIMemory);

            // Fill mock waveform data.

            fillMockDataFrame(mockDataFrameDesc, mDataFrames[idx].sharedMemory.pIMemory);



            // Issue the (asynchronous) callback to the client -- can't be holding the lock

            auto result = mStream->deliverDataFrame(dummyDataFrameDesc);

            auto result = mStream->deliverDataFrame(mockDataFrameDesc);

            if (result.isOk()) {

                LOG(DEBUG) << "Delivered data frame id: " << dummyDataFrameDesc.dataFrameId;

                LOG(DEBUG) << "Delivered data frame id: " << mockDataFrameDesc.dataFrameId;

            } else {

                // This can happen if the client dies and is likely unrecoverable.

                // To avoid consuming resources generating failing calls, we stop sending