From 01dca3d64c8712db59bc024e7dc458cbb4bc9cc8 Mon Sep 17 00:00:00 2001
From: Frankie Lizcano <flizcano@google.com>
Date: Wed, 29 Jun 2022 18:22:02 +0000
Subject: [PATCH] Fixing code style for changes added to expand Tuner HAL VTS
 Dyanmic Configuration

Bug: b/237319139

Test: Ran locally and confirmed changes

Change-Id: I37fee9a84a7885501912e151b7feeb4fe273a14f
---
 .../config/TunerTestingConfigAidlReaderV1_0.h | 70 ++++++++-----------
 1 file changed, 31 insertions(+), 39 deletions(-)

diff --git a/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h b/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
index e0118cd6fb..a150797e78 100644
--- a/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
+++ b/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
@@ -286,8 +286,7 @@ struct TunerTestingConfigAidlReader1_0 {
                     }
                     case FrontendTypeEnum::ISDBS:
                         type = FrontendType::ISDBS;
-                        frontendMap[id].settings.set<
-                            FrontendSettings::Tag::isdbs>(
+                        frontendMap[id].settings.set<FrontendSettings::Tag::isdbs>(
                                 readIsdbsFrontendSettings(feConfig));
                         break;
                     case FrontendTypeEnum::ISDBS3:
@@ -698,49 +697,42 @@ struct TunerTestingConfigAidlReader1_0 {
     }
 
     static FrontendAtscSettings readAtscFrontendSettings(Frontend& feConfig) {
-      ALOGW("[ConfigReader] fe type is atsc");
-      FrontendAtscSettings atscSettings{
-          .frequency = (int64_t) feConfig.getFrequency(),
-      };
-      if (feConfig.hasEndFrequency()) {
-        atscSettings.endFrequency = (int64_t) feConfig.getEndFrequency();
-      }
-      if (!feConfig.hasAtscFrontendSettings_optional()) {
-        ALOGW("[ConfigReader] no more atsc settings");
+        ALOGW("[ConfigReader] fe type is atsc");
+        FrontendAtscSettings atscSettings{
+                .frequency = (int64_t)feConfig.getFrequency(),
+        };
+        if (feConfig.hasEndFrequency()) {
+            atscSettings.endFrequency = (int64_t)feConfig.getEndFrequency();
+        }
+        if (!feConfig.hasAtscFrontendSettings_optional()) {
+            ALOGW("[ConfigReader] no more atsc settings");
+            return atscSettings;
+        }
+        auto atsc = feConfig.getFirstAtscFrontendSettings_optional();
+        atscSettings.inversion = static_cast<FrontendSpectralInversion>(atsc->getInversion());
+        atscSettings.modulation = static_cast<FrontendAtscModulation>(atsc->getModulation());
         return atscSettings;
-      }
-      auto atsc = feConfig.getFirstAtscFrontendSettings_optional();
-      atscSettings.inversion = static_cast<FrontendSpectralInversion>(
-          atsc->getInversion());
-      atscSettings.modulation = static_cast<FrontendAtscModulation>(
-          atsc->getModulation());
-      return atscSettings;
     }
 
-    static FrontendIsdbsSettings readIsdbsFrontendSettings(Frontend &feConfig) {
-      ALOGW("[ConfigReader] fe type is isdbs");
-      FrontendIsdbsSettings isdbsSettings{
-              .frequency = (int64_t)feConfig.getFrequency()
-      };
-      if (feConfig.hasEndFrequency()) {
+    static FrontendIsdbsSettings readIsdbsFrontendSettings(Frontend& feConfig) {
+        ALOGW("[ConfigReader] fe type is isdbs");
+        FrontendIsdbsSettings isdbsSettings{.frequency = (int64_t)feConfig.getFrequency()};
+        if (feConfig.hasEndFrequency()) {
             isdbsSettings.endFrequency = (int64_t)feConfig.getEndFrequency();
-      }
-      if (!feConfig.hasIsdbsFrontendSettings_optional()) {
+        }
+        if (!feConfig.hasIsdbsFrontendSettings_optional()) {
             ALOGW("[ConfigReader] no more isdbs settings");
             return isdbsSettings;
-      }
-      auto isdbs = feConfig.getFirstIsdbsFrontendSettings_optional();
-      isdbsSettings.streamId = (int32_t)isdbs->getStreamId();
-      isdbsSettings.symbolRate = (int32_t)isdbs->getSymbolRate();
-      isdbsSettings.modulation = static_cast<FrontendIsdbsModulation>(
-          isdbs->getModulation());
-      isdbsSettings.coderate = static_cast<FrontendIsdbsCoderate>(
-          isdbs->getCoderate());
-      isdbsSettings.rolloff = static_cast<FrontendIsdbsRolloff>(
-          isdbs->getRolloff());
-      isdbsSettings.streamIdType = static_cast<FrontendIsdbsStreamIdType>(
-          isdbs->getStreamIdType());
-      return isdbsSettings;
+        }
+        auto isdbs = feConfig.getFirstIsdbsFrontendSettings_optional();
+        isdbsSettings.streamId = (int32_t)isdbs->getStreamId();
+        isdbsSettings.symbolRate = (int32_t)isdbs->getSymbolRate();
+        isdbsSettings.modulation = static_cast<FrontendIsdbsModulation>(isdbs->getModulation());
+        isdbsSettings.coderate = static_cast<FrontendIsdbsCoderate>(isdbs->getCoderate());
+        isdbsSettings.rolloff = static_cast<FrontendIsdbsRolloff>(isdbs->getRolloff());
+        isdbsSettings.streamIdType =
+                static_cast<FrontendIsdbsStreamIdType>(isdbs->getStreamIdType());
+        return isdbsSettings;
     }
 
     static bool readFilterTypeAndSettings(Filter filterConfig, DemuxFilterType& type,