commit e1cec2e017a37b1ab57bd7d7e5e0add468de6b41
author Baligh Uddin <baligh@google.com> Sat Oct 24 02:58:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 24 02:58:49 2020 +0000
tree a9d9588806c7f5c9120fd14e37a5b9b10b9d0861
parent 625583fdd39a5113e866fe5a392f478e7c53ee91
parent e4fedd529cbc01c759780d34d7634c320fb5c677

Cleanup references to system/core/base -> system/libbase am: 0243cc00cd am: e4fedd529c

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7250/display/+/1472304

Change-Id: Iad220d16b0bc3e24ee64391938ad0926e38587aa

gralloc/gr_adreno_info.cpp

diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp
index 2b82dc6..8133da7 100644
--- a/gralloc/gr_adreno_info.cpp
+++ b/gralloc/gr_adreno_info.cpp
@@ -282,7 +282,15 @@
     case HAL_PIXEL_FORMAT_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
       return ADRENO_PIXELFORMAT_ASTC_12X12_SRGB;
     default:
-      ALOGE("%s: No map for format: 0x%x", __FUNCTION__, hal_format);
+      // Because ag/12418822 to fix GCA camera-Berlin
+      // long shot issue (b/165335520) will cause log
+      // spew here, add below protected condition to avoid
+      // the log spew first and keep tracking the root cause
+      // on b/166142588.
+      if (hal_format != HAL_PIXEL_FORMAT_R_8)
+      {
+        ALOGE("%s: No map for format: 0x%x", __FUNCTION__, hal_format);
+      }
       break;
   }
 

gralloc/gr_utils.cpp

diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp
index 18bd9a5..1c1ad98 100644
--- a/gralloc/gr_utils.cpp
+++ b/gralloc/gr_utils.cpp
@@ -204,7 +204,15 @@
       bpp = 2;
       break;
     default:
-      ALOGE("Error : %s New format request = 0x%x", __FUNCTION__, format);
+      // Because ag/12418822 to fix GCA camera-Berlin
+      // long shot issue (b/165335520) will cause log
+      // spew here, add below protected condition to avoid
+      // the log spew first and keep tracking the root cause
+      // on b/166142588.
+      if (format != HAL_PIXEL_FORMAT_R_8)
+      {
+        ALOGE("Error : %s New format request = 0x%x", __FUNCTION__, format);
+      }
       break;
   }
 

sde-drm/drm_connector.cpp

diff --git a/sde-drm/drm_connector.cpp b/sde-drm/drm_connector.cpp
index ff501e5..78797bd 100644
--- a/sde-drm/drm_connector.cpp
+++ b/sde-drm/drm_connector.cpp
@@ -494,7 +494,7 @@
   fmt_str[blob->length] = '\0';
   stringstream stream(fmt_str);
   DRM_LOGI("stream str %s len %zu blob str %s len %d", stream.str().c_str(), stream.str().length(),
-           blob->data, blob->length);
+           static_cast<const char *>(blob->data), blob->length);
   string line = {};
   const string display_type = "display type=";
   const string panel_name = "panel name=";
@@ -577,7 +577,7 @@
   fmt_str[blob->length] = '\0';
   stringstream stream(fmt_str);
   DRM_LOGI("stream str %s len %zu blob str %s len %d", stream.str().c_str(), stream.str().length(),
-           blob->data, blob->length);
+           static_cast<const char *>(blob->data), blob->length);
 
   string line = {};
   const string mode_name = "mode_name=";

sde-drm/drm_crtc.cpp

diff --git a/sde-drm/drm_crtc.cpp b/sde-drm/drm_crtc.cpp
index 00174fd..b571ab4 100644
--- a/sde-drm/drm_crtc.cpp
+++ b/sde-drm/drm_crtc.cpp
@@ -305,7 +305,7 @@
   fmt_str[blob->length] = '\0';
   stringstream stream(fmt_str);
   DRM_LOGI("stream str %s len %zu blob str %s len %d", stream.str().c_str(), stream.str().length(),
-           blob->data, blob->length);
+           static_cast<const char *>(blob->data), blob->length);
   string line = {};
   string max_blendstages = "max_blendstages=";
   string qseed_type = "qseed_type=";

sde-drm/drm_plane.cpp

diff --git a/sde-drm/drm_plane.cpp b/sde-drm/drm_plane.cpp
index a5b86da..8f28c3d 100644
--- a/sde-drm/drm_plane.cpp
+++ b/sde-drm/drm_plane.cpp
@@ -436,7 +436,7 @@
   // like formats etc
   stringstream stream(fmt_str);
   DRM_LOGI("stream str %s len %zu blob str %s len %d", stream.str().c_str(), stream.str().length(),
-           blob->data, blob->length);
+           static_cast<const char *>(blob->data), blob->length);
 
   string line = {};
   string pixel_formats = "pixel_formats=";