commit f6cb76c02aeb144e88c02a896b819ea89f108c98
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Oct 06 18:30:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 06 18:30:41 2023 +0000
tree 8af6d83d6d8dca5bd084d209952aaf6faff8abb7
parent 0115f1ccd8fa6506d87df72067d687017581c626
parent 489c28a6b03d5d333789067773b62162c154030c

Merge "Don't depend on String8 cast to C string" into main

libhwc2.1/libdevice/BrightnessController.cpp

diff --git a/libhwc2.1/libdevice/BrightnessController.cpp b/libhwc2.1/libdevice/BrightnessController.cpp
index 88fc9cd..b651ead 100644
--- a/libhwc2.1/libdevice/BrightnessController.cpp
+++ b/libhwc2.1/libdevice/BrightnessController.cpp
@@ -70,11 +70,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 ad26956..8c66345 100644
--- a/libhwc2.1/libdevice/ExynosDisplay.cpp
+++ b/libhwc2.1/libdevice/ExynosDisplay.cpp
@@ -3189,7 +3189,7 @@
                 *outSize, strSize);
         strSize = *outSize;
     }
-    std::strncpy(outName, mDisplayName, strSize);
+    std::strncpy(outName, mDisplayName.c_str(), strSize);
     *outSize = strSize;
 
     return HWC2_ERROR_NONE;