Merge "Fix suspend crash issue on no GPU platform." am: 175621f517 am: 98b07f6b55

am: 9fb8a51cce Change-Id: Iac53929b195ad126cefce5a36a0ade2783b77c95
2016-08-25 18:21:44 +00:00
parent 21cd398c72 9fb8a51cce
commit 1286e51142
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/display/ColorFade.java
+++ b/services/core/java/com/android/server/display/ColorFade.java
@@ -547,6 +547,11 @@ final class ColorFade {
                logEglError("eglChooseConfig");
                return false;
            }
+            if (numEglConfigs[0] <= 0) {
+                Slog.e(TAG, "no valid config found");
+                return false;
+            }
+
            mEglConfig = eglConfigs[0];
        }