commit b0d738af0fe2874416cecac9eb7f931d01a12a31
author Changyeon Jo <changyeon@google.com> Sun Feb 16 10:38:47 2020 -0800
committer Changyeon Jo <changyeon@google.com> Sun Feb 16 10:55:38 2020 -0800
tree aaeb720e61baae9469c16f534f54976b54513fcd
parent 2b09eb6766a17a99d89ba40620372ea5fb3504eb

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: Changyeon Jo <changyeon@google.com>

services/automotive/display/AutomotiveDisplayProxyService.cpp

diff --git a/services/automotive/display/AutomotiveDisplayProxyService.cpp b/services/automotive/display/AutomotiveDisplayProxyService.cpp
index 8f57dcd..4767406 100644
--- a/services/automotive/display/AutomotiveDisplayProxyService.cpp
+++ b/services/automotive/display/AutomotiveDisplayProxyService.cpp
@@ -36,7 +36,7 @@
     if (it == mDisplays.end()) {
         displayToken = SurfaceComposerClient::getPhysicalDisplayToken(id);
         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;
         }
 
@@ -45,7 +45,7 @@
         auto err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &displayConfig);
         if (err != NO_ERROR) {
             ALOGE("Failed to get display configuration of %lX.  "
-                  "This display will be ignored.", id);
+                  "This display will be ignored.", (unsigned long)id);
             return nullptr;
         }
 
@@ -53,7 +53,7 @@
         err = SurfaceComposerClient::getDisplayState(displayToken, &displayState);
         if (err != NO_ERROR) {
             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;
         }
 
@@ -73,7 +73,7 @@
 
         // Create a SurfaceControl instance
         surfaceControl = surfaceClient->createSurface(
-                String8::format("AutomotiveDisplay::%lX", id),
+                String8::format("AutomotiveDisplay::%lX", (unsigned long)id),
                 displayWidth, displayHeight,
                 PIXEL_FORMAT_RGBX_8888, ISurfaceComposerClient::eOpaque);
         if (surfaceControl == nullptr || !surfaceControl->isValid()) {
@@ -106,7 +106,7 @@
     ui::DisplayState displayState;
     auto err = SurfaceComposerClient::getDisplayState(it->second.token, &displayState);
     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;
     }
 
@@ -159,20 +159,20 @@
 
     auto displayToken = SurfaceComposerClient::getPhysicalDisplayToken(id);
     if (displayToken == nullptr) {
-        ALOGE("Given display id, 0x%lX, is invalid.", id);
+        ALOGE("Given display id, 0x%lX, is invalid.", (unsigned long)id);
     } else {
         DisplayConfig displayConfig = {};
         auto err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &displayConfig);
         if (err != NO_ERROR) {
             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 = {};
         err = SurfaceComposerClient::getDisplayState(displayToken, &displayState);
         if (err != NO_ERROR) {
             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));