diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
| commit | 90b17dc3aca5efbed34a82972db73de71b724fe3 (patch) | |
| tree | 9acc413d20b5520ad4f5f96786e46718d5dbb7fb /modules/gralloc/gralloc.cpp | |
| parent | bb992a86df645482167013634a8c1de1a3109344 (diff) | |
| parent | c55d7ac337641c7ad9ff734169e65553fbb40787 (diff) | |
| download | hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.zip hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.gz hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/libhardware into HEAD
Conflicts:
include/hardware/fb.h
include/hardware/hwcomposer.h
modules/audio/audio_hw.c
Change-Id: Ib37d49cb600bf0cd062847f9c0eb3841bae13f74
Diffstat (limited to 'modules/gralloc/gralloc.cpp')
| -rw-r--r-- | modules/gralloc/gralloc.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp index a6b4edd..99aeb01 100644 --- a/modules/gralloc/gralloc.cpp +++ b/modules/gralloc/gralloc.cpp @@ -219,6 +219,7 @@ static int gralloc_alloc(alloc_device_t* dev, case HAL_PIXEL_FORMAT_RGB_565: case HAL_PIXEL_FORMAT_RGBA_5551: case HAL_PIXEL_FORMAT_RGBA_4444: + case HAL_PIXEL_FORMAT_RAW_SENSOR: bpp = 2; break; default: |