From 1064660e05583dae62cb23a4c258316329738096 Mon Sep 17 00:00:00 2001
From: Marvin Ramin <marvinramin@google.com>
Date: Tue, 19 Jan 2021 15:09:47 +0100
Subject: [PATCH] Reduce logging by HdmiCecConfig

HdmiLogger is not enabled by default to make logcat more readable.

Test: manual
Change-Id: I0ddd3a8d8028fceccb9f53520d9e3d755f4b52b6
---
 .../android/server/hdmi/HdmiCecConfig.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
index 2c989672f60b0..e854481985ce7 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
@@ -327,13 +327,13 @@ public class HdmiCecConfig {
         @Storage int storage = getStorage(setting);
         String storageKey = getStorageKey(setting);
         if (storage == STORAGE_SYSPROPS) {
-            Slog.d(TAG, "Reading '" + storageKey + "' sysprop.");
+            HdmiLogger.debug("Reading '" + storageKey + "' sysprop.");
             return mStorageAdapter.retrieveSystemProperty(storageKey, defaultValue);
         } else if (storage == STORAGE_GLOBAL_SETTINGS) {
-            Slog.d(TAG, "Reading '" + storageKey + "' global setting.");
+            HdmiLogger.debug("Reading '" + storageKey + "' global setting.");
             return mStorageAdapter.retrieveGlobalSetting(storageKey, defaultValue);
         } else if (storage == STORAGE_SHARED_PREFS) {
-            Slog.d(TAG, "Reading '" + storageKey + "' shared preference.");
+            HdmiLogger.debug("Reading '" + storageKey + "' shared preference.");
             return mStorageAdapter.retrieveSharedPref(storageKey, defaultValue);
         }
         return null;
@@ -343,13 +343,13 @@ public class HdmiCecConfig {
         @Storage int storage = getStorage(setting);
         String storageKey = getStorageKey(setting);
         if (storage == STORAGE_SYSPROPS) {
-            Slog.d(TAG, "Setting '" + storageKey + "' sysprop.");
+            HdmiLogger.debug("Setting '" + storageKey + "' sysprop.");
             mStorageAdapter.storeSystemProperty(storageKey, value);
         } else if (storage == STORAGE_GLOBAL_SETTINGS) {
-            Slog.d(TAG, "Setting '" + storageKey + "' global setting.");
+            HdmiLogger.debug("Setting '" + storageKey + "' global setting.");
             mStorageAdapter.storeGlobalSetting(storageKey, value);
         } else if (storage == STORAGE_SHARED_PREFS) {
-            Slog.d(TAG, "Setting '" + storageKey + "' shared pref.");
+            HdmiLogger.debug("Setting '" + storageKey + "' shared pref.");
             mStorageAdapter.storeSharedPref(storageKey, value);
             notifySettingChanged(setting);
         }
@@ -605,7 +605,7 @@ public class HdmiCecConfig {
             throw new IllegalArgumentException("Setting '" + name
                     + "' is not a string-type setting.");
         }
-        Slog.d(TAG, "Getting CEC setting value '" + name + "'.");
+        HdmiLogger.debug("Getting CEC setting value '" + name + "'.");
         return retrieveValue(setting, setting.getDefaultValue().getStringValue());
     }
 
@@ -621,7 +621,7 @@ public class HdmiCecConfig {
             throw new IllegalArgumentException("Setting '" + name
                     + "' is not a int-type setting.");
         }
-        Slog.d(TAG, "Getting CEC setting value '" + name + "'.");
+        HdmiLogger.debug("Getting CEC setting value '" + name + "'.");
         String defaultValue = Integer.toString(getIntValue(setting.getDefaultValue()));
         String value = retrieveValue(setting, defaultValue);
         return Integer.parseInt(value);
@@ -646,7 +646,7 @@ public class HdmiCecConfig {
             throw new IllegalArgumentException("Invalid CEC setting '" + name
                                                + "' value: '" + value + "'.");
         }
-        Slog.d(TAG, "Updating CEC setting '" + name + "' to '" + value + "'.");
+        HdmiLogger.debug("Updating CEC setting '" + name + "' to '" + value + "'.");
         storeValue(setting, value);
     }
 
@@ -669,7 +669,7 @@ public class HdmiCecConfig {
             throw new IllegalArgumentException("Invalid CEC setting '" + name
                                                + "' value: '" + value + "'.");
         }
-        Slog.d(TAG, "Updating CEC setting '" + name + "' to '" + value + "'.");
+        HdmiLogger.debug("Updating CEC setting '" + name + "' to '" + value + "'.");
         storeValue(setting, Integer.toString(value));
     }
 }