Merge "Handle invalid empty args to createAutoBrightnessSpline" into nyc-mr1-dev

2016-06-29 23:07:36 +00:00
parent 83485046a5 ad82aca96b
commit 136e649760
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1181,6 +1181,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
    }

    private static Spline createAutoBrightnessSpline(int[] lux, int[] brightness) {
+        if (lux == null || lux.length == 0 || brightness == null || brightness.length == 0) {
+            Slog.e(TAG, "Could not create auto-brightness spline.");
+            return null;
+        }
        try {
            final int n = brightness.length;
            float[] x = new float[n];