Merge "Ensure valid brightness is sent to surface control" into sc-dev

2021-03-05 17:52:49 +00:00
parent a57c2b816e 53a65688d5
commit faa55308ea
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -767,6 +767,12 @@ final class LocalDisplayAdapter extends DisplayAdapter {
                    }

                    private void setDisplayBrightness(float brightness) {
+                        // Ensure brightnessState is valid, before processing and sending to
+                        // surface control
+                        if (Float.isNaN(brightness)) {
+                            return;
+                        }
+
                        if (DEBUG) {
                            Slog.d(TAG, "setDisplayBrightness("
                                    + "id=" + physicalDisplayId