Merge "Reduce logging by HdmiCecConfig" (18e3f452) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecConfig.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -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));
		}
		}