diff options
| author | 2010-06-30 16:01:33 -0700 | |
|---|---|---|
| committer | 2010-06-30 16:01:33 -0700 | |
| commit | e341a0b5e9a1e30a020970a69c58c34f902ea06f (patch) | |
| tree | ab13f2fe19b73142b7e93c40d08f9ddf082f1b8d /libs/surfaceflinger/SurfaceFlinger.cpp | |
| parent | c511d4f84cd2f71df610286e9373ca0fe38b1353 (diff) | |
| parent | 30fe6fa07a9b9c6e7498198608125add8eb40744 (diff) | |
am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp
* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
fix live wallpapers on Droid
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 23efd161fad7..68e8f19e7ec0 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -1263,10 +1263,19 @@ sp<Layer> SurfaceFlinger::createNormalSurface( format = PIXEL_FORMAT_RGBA_8888; break; case PIXEL_FORMAT_OPAQUE: +#ifdef NO_RGBX_8888 + format = PIXEL_FORMAT_RGB_565; +#else format = PIXEL_FORMAT_RGBX_8888; +#endif break; } +#ifdef NO_RGBX_8888 + if (format == PIXEL_FORMAT_RGBX_8888) + format = PIXEL_FORMAT_RGBA_8888; +#endif + sp<Layer> layer = new Layer(this, display, client); status_t err = layer->setBuffers(w, h, format, flags); if (LIKELY(err != NO_ERROR)) { |