commit 0e0163ee5dd276e464c3027cb8e37dfb64e9c38f
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 16 09:15:17 2010 -0700
committer Android Code Review <code-review@android.com> Mon Aug 16 09:15:17 2010 -0700
tree 974c4b074840deffb962750b8fd5294249ca4d6a
parent e02856c0f90f74cf03353b39a654c286b5100584
parent 3af76d897849e4e73f967647b0e3c11cf88e9ca5

Merge "bootanimation: Don't open non-existing bootanimation.zip"

opengl/libs/EGL/egl.cpp

diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 40317e7..de740a3 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -843,10 +843,13 @@
     EGLint patch_index = -1;
     GLint attr;
     size_t size = 0;
-    while ((attr=attrib_list[size]) != EGL_NONE) {
-        if (attr == EGL_CONFIG_ID)
-            patch_index = size;
-        size += 2;
+
+    if (attrib_list != NULL) {
+        while ((attr=attrib_list[size]) != EGL_NONE) {
+            if (attr == EGL_CONFIG_ID)
+                patch_index = size;
+            size += 2;
+        }
     }
     if (patch_index >= 0) {
         size += 2; // we need copy the sentinel as well

services/surfaceflinger/LayerBuffer.cpp

diff --git a/services/surfaceflinger/LayerBuffer.cpp b/services/surfaceflinger/LayerBuffer.cpp
index 5c21593..0869283 100644
--- a/services/surfaceflinger/LayerBuffer.cpp
+++ b/services/surfaceflinger/LayerBuffer.cpp
@@ -540,7 +540,7 @@
     const ISurface::BufferHeap& buffers(mBufferHeap);
     uint32_t w = mLayer.mTransformedBounds.width();
     uint32_t h = mLayer.mTransformedBounds.height();
-    if (buffers.w * h != buffers.h * w) {
+    if (mLayer.getOrientation() & (Transform::ROT_90 | Transform::ROT_270)) {
         int t = w; w = h; h = t;
     }