LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am cfb58b73: Merge "Emulator gralloc: Fix RAW_SENSOR conditions." into jb-mr1-dev

Browse Source 
* commit 'cfb58b73a15511461c0e1394094337cb6b57381a':
  Emulator gralloc: Fix RAW_SENSOR conditions.
This commit is contained in:
Eino-Ville Talvala
2012-08-20 16:27:31 -07:00
committed by Android Git Automerger
parent d0b485127f cfb58b73a1
commit 08d13376da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/emulator/opengl/system/gralloc/gralloc.cpp
View File

@@ -217,8 +217,8 @@ static int gralloc_alloc(alloc_device_t* dev,
case HAL_PIXEL_FORMAT_RAW_SENSOR:
bpp = 2;
align = 16*bpp;
if (! ((sw_read && hw_cam_write) || (sw_write && hw_cam_read) ) ) {
// Raw sensor data only goes to/from camera to CPU
if (! ((sw_read || hw_cam_read) && (sw_write || hw_cam_write) ) ) {
// Raw sensor data only goes between camera and CPU
return -EINVAL;
}
// Not expecting to actually create any GL surfaces for this