| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am eafa266c: (-s ours) DO NOT MERGE | Travis Geiselbrecht | 2012-04-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Travis Geiselbrecht | 2012-04-20 | 1 | -1/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "WORKAROUND for Bug:5965421" | Mathias Agopian | 2012-04-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WORKAROUND for Bug:5965421 | Mathias Agopian | 2012-04-18 | 1 | -0/+4 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Use new camera connect api." | Wu-cheng Li | 2012-04-19 | 2 | -6/+6 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c6336459: (-s ours) DO NOT MERGE | Travis Geiselbrecht | 2012-04-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Travis Geiselbrecht | 2012-04-12 | 1 | -2/+32 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "hwc: add handling for new style vsync events" | Erik Gilling | 2012-04-12 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hwc: add handling for new style vsync events | Erik Gilling | 2012-04-11 | 1 | -1/+4 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e22bec1a: (-s ours) DO NOT MERGE | Travis Geiselbrecht | 2012-04-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Travis Geiselbrecht | 2012-04-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraHAL: Fix for CTS test #testFocusDistances | Emilian Peev | 2012-04-11 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add API 0.3 support to HWC HAL. | Mathias Agopian | 2012-04-05 | 1 | -22/+91 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add omapfb.h header file | Erik Gilling | 2012-04-03 | 3 | -0/+506 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/ics-aah' | Mike Lockwood | 2012-04-03 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Travis Geiselbrecht | 2012-03-22 | 1 | -1/+31 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04512dd' | Mike Lockwood | 2012-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hwc: pull down 32 modes instead of 16, some panels have a lot | Travis Geiselbrecht | 2012-03-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04512dd^' | Mike Lockwood | 2012-04-03 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Dandawate Saket | 2012-03-21 | 1 | -20/+166 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Bryan Buckley | 2012-03-14 | 2 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Trusted Logic | 2012-03-14 | 2 | -721/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Bryan Buckley | 2012-03-14 | 3 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Trusted Logic | 2012-03-14 | 4 | -19/+26 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Trusted Logic | 2012-03-14 | 8 | -1/+2194 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Trusted Logic | 2012-03-14 | 7 | -26/+422 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE | Trusted Logic | 2012-03-14 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 82a05e51: Use local time in EXIF. | Angus Kong | 2011-12-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 449e98a9: hwc: set FB z-order when there are no hwc layers | Lajos Molnar | 2011-12-13 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0aead355: hwc: added static image support | Lajos Molnar | 2011-12-13 | 2 | -3/+169 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 12c821db: hwc: update to new addressing mode handling | Erik Gilling | 2011-12-13 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2b86fd0c: hwc: add support for forced docking (in the dock) | Lajos Molnar | 2011-12-08 | 1 | -7/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am e14d5293: hwc: extract HDMI mode scoring function | Lajos Molnar | 2011-12-08 | 1 | -24/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3837de4f: hwc: refactor prepare: extract out hdmi cloning methods | Lajos Molnar | 2011-12-08 | 1 | -92/+108 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 44a0023d: hwc: refactor prepare: separate gathering layer statistics and c... | Lajos Molnar | 2011-12-08 | 1 | -44/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3797fa98: hwc: use LCD\'s pixel aspect ratio | Lajos Molnar | 2011-12-08 | 1 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 00d8485d: hwc: minor code cleanup | Lajos Molnar | 2011-12-08 | 1 | -20/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b81fb68c: hwc: simplify layer hint setting | Lajos Molnar | 2011-12-08 | 1 | -27/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5706ba0d: hwc: simplify color format handling | Lajos Molnar | 2011-12-08 | 1 | -43/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b79b42d1: hwc: cleanup: fix spacing, removed dead code | Lajos Molnar | 2011-12-08 | 1 | -57/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 734de7a7: hwc: cleanup: cleaned up debug messages | Lajos Molnar | 2011-12-08 | 1 | -88/+100 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am e055e4bf: hwc: cleanup: resolve compiler warnings | Lajos Molnar | 2011-12-08 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am cb64c2be: hwc: remove name collision for DISPLAY_SETUP_DISPLAY | Lajos Molnar | 2011-12-08 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a752a6ad: hwc: Fix calculation of on_tv | Lajos Molnar | 2011-12-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4b267e18: hwc: fix issues handling force_sgx | Lajos Molnar | 2011-12-08 | 1 | -13/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bb7a8bcd: CameraHAL: Fixes a couple of corner cases with AF and capture DO... | Akwasi Boateng | 2011-12-01 | 2 | -11/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3ffd5d43: Merge changes I0878a9f8,I1011252e into ics-mr1 | Iliyan Malchev | 2011-11-30 | 7 | -9/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am cf828bf0: Reconcile with ics-mr0-release | The Android Open Source Project | 2011-11-18 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d31eec66: am 0bb54549: Ignore camera.flash_off system property for user build | James Dong | 2011-11-18 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am e4639448: CameraHAL: clean up logs | Iliyan Malchev | 2011-11-17 | 6 | -14/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|