Merge "[CEC Configuration] Add debug output to adb shell dumpsys hdmi_control"
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index ad5290c..0034df3 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -95,10 +95,12 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -2319,6 +2321,19 @@
pw.println("mHdmiCecVolumeControlEnabled: " + mHdmiCecVolumeControlEnabled);
pw.decreaseIndent();
+ // CEC settings
+ pw.println("CEC settings:");
+ pw.increaseIndent();
+ HdmiCecConfig hdmiCecConfig = HdmiControlService.this.getHdmiCecConfig();
+ List<String> allSettings = hdmiCecConfig.getAllSettings();
+ Set<String> userSettings = new HashSet<>(hdmiCecConfig.getUserSettings());
+ for (String setting : allSettings) {
+ pw.println(setting + ": " + hdmiCecConfig.getValue(getContext(), setting)
+ + " (default: " + hdmiCecConfig.getDefaultValue(setting) + ")"
+ + (userSettings.contains(setting) ? " [modifiable]" : ""));
+ }
+ pw.decreaseIndent();
+
pw.println("mMhlController: ");
pw.increaseIndent();
mMhlController.dump(pw);