Merge pull request rdkcentral#5796 from apatel859/main

ES1-1902: Launch issue with WTA app in WH
RDKDoc · Oct 16, 2024 · 7322b4e · 7322b4e
2 parents 3b35808 + 267c537
commit 7322b4e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/FrontPanel/CHANGELOG.md b/FrontPanel/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.0.8] - 2024-09-30
+### Added
+- Fixed getFrontPanelIndicatorInfo API
+
 ## [1.0.7] - 2024-05-25
 ### Added
 - Make plugin autostart configurable from recipe

diff --git a/FrontPanel/FrontPanel.cpp b/FrontPanel/FrontPanel.cpp
@@ -65,7 +65,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 7
+#define API_VERSION_NUMBER_PATCH 8
 
 namespace
 {
@@ -114,11 +114,10 @@ namespace
         return name;
     }
 
-    JsonObject getFrontPanelIndicatorInfo(device::FrontPanelIndicator &indicator)
+    JsonObject getFrontPanelIndicatorInfo(device::FrontPanelIndicator &indicator,JsonObject &indicatorInfo)
     {
         JsonObject returnResult;
         int levels=0, min=0, max=0;
-        JsonObject indicatorInfo;
         string range;
 
         indicator.getBrightnessLevels(levels, min, max);
@@ -138,6 +137,7 @@ namespace
         {
             availableColors.Add(colorsList.at(j).getName());
         }
+
         if (availableColors.Length() > 0)
         {
             indicatorInfo["colors"] = availableColors;
@@ -632,17 +632,21 @@ namespace WPEFramework
             {
                 IndicatorNameIarm = fpIndicators.at(i).getName();
                 MappedName = iarm2svc(IndicatorNameIarm);
+                getFrontPanelIndicatorInfo(fpIndicators.at(i),indicatorInfo);
                 if (MappedName != IndicatorNameIarm)
                 {
-                    indicatorInfo = getFrontPanelIndicatorInfo(fpIndicators.at(i));
                     returnResult[MappedName.c_str()] = indicatorInfo;
                 }
+                else
+                {
+                    returnResult[IndicatorNameIarm.c_str()] = indicatorInfo;
+                }
             }
 
 #ifdef CLOCK_BRIGHTNESS_ENABLED
             try
             {
-                indicatorInfo = getFrontPanelIndicatorInfo(device::FrontPanelConfig::getInstance().getTextDisplay(0));
+                getFrontPanelIndicatorInfo(device::FrontPanelConfig::getInstance().getTextDisplay(0),indicatorInfo);
                 returnResult[CLOCK_LED] = indicatorInfo;
             }
             catch (...)