Merge "surfaceFlinger: dump screenPartStatus" into main

Author: zbw182

libs/ui/include/ui/DisplayIdentification.h

@@ -55,6 +55,17 @@ enum class ScreenPartStatus : uint8_t {
     REPLACED = 2,
 };
 
+inline std::string ScreenPartStatusToString(ScreenPartStatus screenPartStatus) {
+    switch (screenPartStatus) {
+        case ScreenPartStatus::ORIGINAL:
+            return "ORIGINAL";
+        case ScreenPartStatus::REPLACED:
+            return "REPLACED";
+        default:
+            return "UNSUPPORTED";
+    }
+}
+
 struct DisplayIdentificationInfo {
     PhysicalDisplayId id;
     std::string name;

services/surfaceflinger/SurfaceFlinger.cpp

@@ -6114,7 +6114,9 @@ void SurfaceFlinger::dumpDisplayIdentificationData(std::string& result) const {
             continue;
         }
 
-        StringAppendF(&result, "port=%u pnpId=%s displayName=\"", port, edid->pnpId.data());
+        StringAppendF(&result, "port=%u pnpId=%s screenPartStatus=%s displayName=\"", port,
+                      edid->pnpId.data(),
+                      android::ScreenPartStatusToString(screenPartStatus).c_str());
         result.append(edid->displayName.data(), edid->displayName.length());
         result.append("\"\n");
     }