Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 613493c4 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 

Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp

* commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
  fix [3119687] [Maps][4.6.0] Force close in street view
parents fb0163b8 878353fb

opengl/libagl/egl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -996,8 +996,8 @@ static config_pair_t const config_4_attribute_list[] = { 
        { EGL_GREEN_SIZE,       8 },

        { EGL_RED_SIZE,         8 },

        { EGL_DEPTH_SIZE,       0 },

        { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBA_8888 },

        { EGL_CONFIG_ID,        2 },

        { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBA_8888 },

        { EGL_SURFACE_TYPE,     EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT },

};
@@ -1033,8 +1033,8 @@ static config_pair_t const config_7_attribute_list[] = { 
        { EGL_GREEN_SIZE,       0 },

        { EGL_RED_SIZE,         0 },

        { EGL_DEPTH_SIZE,      16 },

        { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_A_8 },

        { EGL_CONFIG_ID,        5 },

        { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_A_8 },

        { EGL_SURFACE_TYPE,     EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT },

};