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

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

Explicit cast uint64_t as unsigned long type 



This fixes build errors caused by the difference in uint64_t
definitions between targets.

Bug: 149647375
Test: build for x86 target
Change-Id: I3a0845b0527a7cf0f20c7983870c2d3dd8219444
Signed-off-by: default avatarChangyeon Jo <changyeon@google.com>
parent 2b09eb67

services/automotive/display/AutomotiveDisplayProxyService.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ AutomotiveDisplayProxyService::getIGraphicBufferProducer(uint64_t id) { 
    if (it == mDisplays.end()) {

    if (it == mDisplays.end()) {

        displayToken = SurfaceComposerClient::getPhysicalDisplayToken(id);

        displayToken = SurfaceComposerClient::getPhysicalDisplayToken(id);

        if (displayToken == nullptr) {

        if (displayToken == nullptr) {

            ALOGE("Given display id, 0x%lX, is invalid.", id);

            ALOGE("Given display id, 0x%lX, is invalid.", (unsigned long)id);

            return nullptr;

            return nullptr;

        }

        }
@@ -45,7 +45,7 @@ AutomotiveDisplayProxyService::getIGraphicBufferProducer(uint64_t id) { 
        auto err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &displayConfig);

        auto err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &displayConfig);

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            ALOGE("Failed to get display configuration of %lX.  "

            ALOGE("Failed to get display configuration of %lX.  "

                  "This display will be ignored.", id);

                  "This display will be ignored.", (unsigned long)id);

            return nullptr;

            return nullptr;

        }

        }
@@ -53,7 +53,7 @@ AutomotiveDisplayProxyService::getIGraphicBufferProducer(uint64_t id) { 
        err = SurfaceComposerClient::getDisplayState(displayToken, &displayState);

        err = SurfaceComposerClient::getDisplayState(displayToken, &displayState);

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            ALOGE("Failed to get current display status of %lX.  "

            ALOGE("Failed to get current display status of %lX.  "

                  "This display will be ignored.", id);

                  "This display will be ignored.", (unsigned long)id);

            return nullptr;

            return nullptr;

        }

        }
@@ -73,7 +73,7 @@ AutomotiveDisplayProxyService::getIGraphicBufferProducer(uint64_t id) { 




        // Create a SurfaceControl instance

        // Create a SurfaceControl instance

        surfaceControl = surfaceClient->createSurface(

        surfaceControl = surfaceClient->createSurface(

                String8::format("AutomotiveDisplay::%lX", id),

                String8::format("AutomotiveDisplay::%lX", (unsigned long)id),

                displayWidth, displayHeight,

                displayWidth, displayHeight,

                PIXEL_FORMAT_RGBX_8888, ISurfaceComposerClient::eOpaque);

                PIXEL_FORMAT_RGBX_8888, ISurfaceComposerClient::eOpaque);

        if (surfaceControl == nullptr || !surfaceControl->isValid()) {

        if (surfaceControl == nullptr || !surfaceControl->isValid()) {
@@ -106,7 +106,7 @@ Return<bool> AutomotiveDisplayProxyService::showWindow(uint64_t id) { 
    ui::DisplayState displayState;

    ui::DisplayState displayState;

    auto err = SurfaceComposerClient::getDisplayState(it->second.token, &displayState);

    auto err = SurfaceComposerClient::getDisplayState(it->second.token, &displayState);

    if (err != NO_ERROR) {

    if (err != NO_ERROR) {

        ALOGE("Failed to get current state of the display 0x%lX", id);

        ALOGE("Failed to get current state of the display 0x%lX", (unsigned long)id);

        return false;

        return false;

    }

    }
@@ -159,20 +159,20 @@ Return<void> AutomotiveDisplayProxyService::getDisplayInfo(uint64_t id, getDispl 




    auto displayToken = SurfaceComposerClient::getPhysicalDisplayToken(id);

    auto displayToken = SurfaceComposerClient::getPhysicalDisplayToken(id);

    if (displayToken == nullptr) {

    if (displayToken == nullptr) {

        ALOGE("Given display id, 0x%lX, is invalid.", id);

        ALOGE("Given display id, 0x%lX, is invalid.", (unsigned long)id);

    } else {

    } else {

        DisplayConfig displayConfig = {};

        DisplayConfig displayConfig = {};

        auto err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &displayConfig);

        auto err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &displayConfig);

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            ALOGW("Failed to get display configuration of %lX.  "

            ALOGW("Failed to get display configuration of %lX.  "

                  "This display will be ignored.", id);

                  "This display will be ignored.", (unsigned long)id);

        }

        }





        ui::DisplayState displayState = {};

        ui::DisplayState displayState = {};

        err = SurfaceComposerClient::getDisplayState(displayToken, &displayState);

        err = SurfaceComposerClient::getDisplayState(displayToken, &displayState);

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            ALOGW("Failed to get current display status of %lX.  "

            ALOGW("Failed to get current display status of %lX.  "

                  "This display will be ignored.", id);

                  "This display will be ignored.", (unsigned long)id);

        }

        }





        activeConfig.setToExternal((uint8_t*)&displayConfig, sizeof(DisplayConfig));

        activeConfig.setToExternal((uint8_t*)&displayConfig, sizeof(DisplayConfig));