commit 0a357a1a7353dc93f6e0c03fbf242231232948d8
author Martijn Coenen <maco@google.com> Thu Aug 25 20:08:14 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 25 20:08:14 2016 +0000
tree f22df89a5ea31e9db7b9f842cb5f777f017169b0
parent 175621f51734a1880186e48cc74a48119bcd708f
parent d90d8d615a99ad9f75e2911e98a166b396a89053

Merge changes from topic 'utf'

* changes:
  Add bound checks to utf16_to_utf8
  Unicode: specify destination length in utf8_to_utf16 methods

services/core/java/com/android/server/display/ColorFade.java

diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java
index a16fcd2..2541050 100644
--- a/services/core/java/com/android/server/display/ColorFade.java
+++ b/services/core/java/com/android/server/display/ColorFade.java
@@ -547,6 +547,11 @@
                 logEglError("eglChooseConfig");
                 return false;
             }
+            if (numEglConfigs[0] <= 0) {
+                Slog.e(TAG, "no valid config found");
+                return false;
+            }
+
             mEglConfig = eglConfigs[0];
         }