Merge "Get brightness adb command" into main
diff --git a/services/core/java/com/android/server/display/DisplayManagerShellCommand.java b/services/core/java/com/android/server/display/DisplayManagerShellCommand.java
index 9eef657..e46397b 100644
--- a/services/core/java/com/android/server/display/DisplayManagerShellCommand.java
+++ b/services/core/java/com/android/server/display/DisplayManagerShellCommand.java
@@ -62,6 +62,8 @@
return showNotification();
case "cancel-notifications":
return cancelNotifications();
+ case "get-brightness":
+ return getBrightness();
case "set-brightness":
return setBrightness();
case "reset-brightness-configuration":
@@ -313,6 +315,25 @@
return 0;
}
+ private int getBrightness() {
+ String displayIdString = getNextArg();
+ if (displayIdString == null) {
+ getErrPrintWriter().println("Error: no display id specified");
+ return 1;
+ }
+ int displayId;
+ try {
+ displayId = Integer.parseInt(displayIdString);
+ } catch (NumberFormatException e) {
+ getErrPrintWriter().println("Error: invalid displayId=" + displayIdString + " not int");
+ return 1;
+ }
+ final Context context = mService.getContext();
+ final DisplayManager dm = context.getSystemService(DisplayManager.class);
+ getOutPrintWriter().println(dm.getBrightness(displayId));
+ return 0;
+ }
+
private int setBrightness() {
String brightnessText = getNextArg();
if (brightnessText == null) {