From ad82aca96ba224b95c69bc3eabfc7926c908160d Mon Sep 17 00:00:00 2001 From: Erik Wolsheimer Date: Tue, 28 Jun 2016 14:51:07 -0700 Subject: [PATCH] Handle invalid empty args to createAutoBrightnessSpline BUG: 18572096 Change-Id: I9dfc2215994a4f7a70ef6bdd04b620917e4ec034 --- .../com/android/server/display/DisplayPowerController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 8f8afd5615f33..61af8edebb839 100644 --- 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];