commit 1f1402d4716646edbaaf4f529aeb4a265df7a15f
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Oct 06 21:26:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 06 21:26:22 2023 +0000
tree 5e339df60737791fb1b27177cb09a208414e4375
parent 037dae613f8081a1b4f80c6a2098b335986235e0
parent 14a766f54ef5ce68d32c660b2a8605f69dfda8bc

Merge "Don't depend on String8 cast to C string" into main am: f6cb76c02a am: a937a61be7 am: cf75f0e58e am: 14a766f54e

Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/2748841

Change-Id: Idf3691431b1b109fb6de680691fe4d06b7b7bc7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libhwc2.1/libdevice/BrightnessController.cpp

diff --git a/libhwc2.1/libdevice/BrightnessController.cpp b/libhwc2.1/libdevice/BrightnessController.cpp
index 2f9327e..cc36c94 100644
--- a/libhwc2.1/libdevice/BrightnessController.cpp
+++ b/libhwc2.1/libdevice/BrightnessController.cpp
@@ -210,11 +210,12 @@
     String8 propName;
     propName.appendFormat(kDimmingUsagePropName, mPanelIndex);
 
-    mBrightnessDimmingUsage = static_cast<BrightnessDimmingUsage>(property_get_int32(propName, 0));
+    mBrightnessDimmingUsage =
+            static_cast<BrightnessDimmingUsage>(property_get_int32(propName.c_str(), 0));
 
     propName.clear();
     propName.appendFormat(kDimmingHbmTimePropName, mPanelIndex);
-    mHbmDimmingTimeUs = property_get_int32(propName, kHbmDimmingTimeUs);
+    mHbmDimmingTimeUs = property_get_int32(propName.c_str(), kHbmDimmingTimeUs);
 
     if (mBrightnessDimmingUsage == BrightnessDimmingUsage::NORMAL) {
         mDimming.store(true);

libhwc2.1/libdevice/ExynosDisplay.cpp

diff --git a/libhwc2.1/libdevice/ExynosDisplay.cpp b/libhwc2.1/libdevice/ExynosDisplay.cpp
index a69c4b9..3688207 100644
--- a/libhwc2.1/libdevice/ExynosDisplay.cpp
+++ b/libhwc2.1/libdevice/ExynosDisplay.cpp
@@ -3199,7 +3199,7 @@
                 *outSize, strSize);
         strSize = *outSize;
     }
-    std::strncpy(outName, mDisplayName, strSize);
+    std::strncpy(outName, mDisplayName.c_str(), strSize);
     *outSize = strSize;
 
     return HWC2_ERROR_NONE;