summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 77143165 to masterSimon Wilson2011-11-155-4/+43
|\ | | | | | | Change-Id: Ic30c853d7f9898206699c3c0e648a54362ed4824
| * Merge changes Id46d9ccd,I0b4555b1 into ics-mr1Simon Wilson2011-11-145-4/+43
| |\ | | | | | | | | | | | | | | | * changes: Camera: move AF polling code from driver into HAL new prebuilt kernel
| | * Camera: move AF polling code from driver into HALkyoungho.yun2011-11-143-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | Preview is paused during auto focus. To fix this, move polling code from driver to HAL. Change-Id: Id46d9ccd2aad1a269806f4fddf8ad39c3c87bae9 Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
| | * new prebuilt kernelSimon Wilson2011-11-142-0/+0
| | | | | | | | | | | | | | | | | | d789370 S5PC11X: CAMERA: Remove AF polling code Change-Id: I0b4555b17fb24aaf197b25b27ba88c2c97b8cb6f
* | | am b69a52bc: Merge "sensors: Remove workaround for lightsensor driver bug" ↵Arve Hjønnevåg2011-11-142-13/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit 'b69a52bc3a1ec1b2973022b1574f236747e285a0': sensors: Remove workaround for lightsensor driver bug
| * | Merge "sensors: Remove workaround for lightsensor driver bug" into ics-mr1Arve Hjønnevåg2011-11-142-13/+1
| |\ \ | | |/ | |/|
| | * sensors: Remove workaround for lightsensor driver bugArve Hjønnevåg2011-11-102-13/+1
| | | | | | | | | | | | Change-Id: I5d8bd3f355ca46f6c60713b1516a621e45b53cfc
* | | am 8a6eb191: kernel + wifi prebuild update (rtc fix reverted, gpu, wifi, ↵JP Abgrall2011-11-142-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | cpufreq, oprofile) * commit '8a6eb191ae17a2c2b979def1ce5281befacdc095': kernel + wifi prebuild update (rtc fix reverted, gpu, wifi, cpufreq, oprofile)
| * | kernel + wifi prebuild update (rtc fix reverted, gpu, wifi, cpufreq, oprofile)JP Abgrall2011-11-142-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77c951f herring_defconfig: compile OProfile into the kernel. 0934eb0 gpu: pvr: Update to DDK 1.8@550175 9df6549 Merge remote branch 'common/android-3.0' into android-samsung-30-wip-mergedown 0d8f32b net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT 1720a91 net: wireless: bcmdhd: Call init_ioctl() only if was started properly 766aaa6 net: wireless: bcmdhd: Fix possible memory leak in escan/iscan fe1b36d ARM: s5pv210: herring: Add gp2a max and fuzz values 0a6e7e1 input: gp2a: Pass lightsensor max and fuzz values in platform data. 8cd9c0f gp2a: set poll_delay to DELAY_LOWBOUND when new delay < DELAY_LOWBOUND 3c43904 input: gp2a: Remove cusom filtering of adc values and set the fuzz value instead 248a9be gp2a: delay first read after light sensor enable 6c5befe gp2a: report light sensor value on enable 6fad5b1 tuna: sensors: light sensor bug fixes 5049220 tuna: sensors: proximity sensor driver bug fix 109efb7 input: gp2a: Copy bugfixes from initial tuna gp2a driver cde1b7c Revert "rtc: s3c: fix rtc alarm not triggering - TEMPORARY HACK" 5113cb1 cpufreq: interactive governor: default 20ms timer 96cd250 cpufreq: interactive governor: go to intermediate hi speed before max eb5a342 cpufreq: interactive governor: scale to max only if at min speed a610c81 cpufreq: interactive governor: apply intermediate load on current speed 2665c41 ARM: idle: update idle ticks before call idle end notifier 050c06e input: gpio_input: don't print debounce message unless flag is set Change-Id: If9cb8ee36944e26a20fcbb131a1925e6c538b462
* | | am 155211bb: Amended Samsung License for proprietary binariesJean-Baptiste Queru2011-11-111-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '155211bb57f99bc4bc3098f7fab12d26e1f5060f': Amended Samsung License for proprietary binaries
| * | Amended Samsung License for proprietary binariesJean-Baptiste Queru2011-11-111-2/+2
| | | | | | | | | | | | | | | Bug: 4295425 Change-Id: I014de6213fdc9adb297577d92dbb919fb6d21fc8
* | | am 421c7261: Merge "Make Crespo landscape dock work. Bug: 5397037" into ics-mr1Jeff Brown2011-11-111-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '421c7261cd956c18cd3e6cfb82345f13e73db61b': Make Crespo landscape dock work. Bug: 5397037
| * | Merge "Make Crespo landscape dock work. Bug: 5397037" into ics-mr1Jeff Brown2011-11-111-0/+1
| |\ \
| | * | Make Crespo landscape dock work.Jeff Brown2011-11-101-0/+1
| | |/ | | | | | | | | | | | | | | | Bug: 5397037 Change-Id: I9f003dc8263fadff02c0fba50a302e2ff50b6a4c
* | | am 1f7dcfde: Merge "Allow wallet to use NFCEE on crespo and crepo4g." into ↵Nick Pelly2011-11-113-0/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr1 * commit '1f7dcfde5d86f44741280f7d9b2c61835058ade3': Allow wallet to use NFCEE on crespo and crepo4g.
| * | Merge "Allow wallet to use NFCEE on crespo and crepo4g." into ics-mr1Nick Pelly2011-11-113-0/+34
| |\ \
| | * | Allow wallet to use NFCEE on crespo and crepo4g.Nick Pelly2011-11-113-0/+34
| | |/ | | | | | | | | | | | | Bug: 4515759 Change-Id: I3c6004ca56225824823707bddd9067496c449515
* | | am de21127c: Merge "libaudio: increase audio buffer size" into ics-mr1Eric Laurent2011-11-111-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'de21127cf8438adbd481978fe874314433a06b30': libaudio: increase audio buffer size
| * | Merge "libaudio: increase audio buffer size" into ics-mr1Eric Laurent2011-11-111-2/+2
| |\ \
| | * | libaudio: increase audio buffer sizeEric Laurent2011-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring playback and capture buffer size back to their initial size. Current size was dictated by constraints in early voice processing implementation but is not necessary anymore. Increasing buffer size will help in power consumption and limit possible occurence of audio skipping during playback and capture. Change-Id: I7837c62e11700ed5c9a26f52fb27170add09721d
* | | | am cfdf0258: Merge "Fix Empty thumbnails generated while in timelapse ↵James Dong2011-11-112-4/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | recording sometimes" into ics-mr1 * commit 'cfdf025803c01a937810e53d861e1746486c4b9a': Fix Empty thumbnails generated while in timelapse recording sometimes
| * | | Merge "Fix Empty thumbnails generated while in timelapse recording ↵James Dong2011-11-112-4/+24
| |\ \ \ | | | | | | | | | | | | | | | sometimes" into ics-mr1
| | * | | Fix Empty thumbnails generated while in timelapse recording sometimesSeungBeom Kim2011-11-102-4/+24
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia17ed033634c5e8709a04c974553fe426e7d9dcd Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com> related-to-bug: 5566262
* | | | am 8fe86ce4: kernel + wifi prebuild update (rtc alarm fix, GPU vs CPU freq, ...)JP Abgrall2011-11-112-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8fe86ce4f5f49d886a4c11e841dde1740a068fe5': kernel + wifi prebuild update (rtc alarm fix, GPU vs CPU freq, ...)
| * | | kernel + wifi prebuild update (rtc alarm fix, GPU vs CPU freq, ...)JP Abgrall2011-11-102-0/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 29e8184 rtc: s3c: fix rtc alarm not triggering - TEMPORARY HACK b1af969 s5p: gpu: pvr: tweak cpufreq policy min freq if GPU is busy 895cf8b ARM: Samsung: Give vmalloc area 96MB back 5dd011b ARM: s5pv210: herring: Add CONFIG_IP_MULTICAST option Change-Id: I9c54779ea9ac00488deaef8edfd80fb296eb7eb0
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-100-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: Ia4fd87acd2841e7460ea96acb7d071341f33fc14
| * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-100-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | |\
* | | | \ am 85e80ef6: sensors: Retry poll on EINTRArve Hjønnevåg2011-11-101-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '85e80ef669952286e5a8ea5ea642bc7acf4cd549': sensors: Retry poll on EINTR
| * | | | sensors: Retry poll on EINTRArve Hjønnevåg2011-11-091-1/+3
| |/ / / | | | | | | | | | | | | Change-Id: I3c6090ef7b0480be63856f9c3356426c7d761777
* | | | am e91e13d8: kernel + wifi prebuild update (bcm fixes, tcp nuke fix)JP Abgrall2011-11-092-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e91e13d8b8d0cac4848a06f39575983d0a8762ff': kernel + wifi prebuild update (bcm fixes, tcp nuke fix)
| * | | kernel + wifi prebuild update (bcm fixes, tcp nuke fix)JP Abgrall2011-11-082-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82b724f Merge remote branch 'common/android-3.0' into android-samsung-30-wip-mergedown 99dd809 ARM: s5pv210: herring: Add delay to wait for wlan carddetect 3f4f629 net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down 5d94d7a net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down 19179eb net: wireless: bcmdhd: Improve suspend/resume processing 40dd812 net: wireless: bcmdhd: Check if FW is Ok for internal FW call adfa7bc tcp: Don't nuke connections for the wrong protocol Change-Id: Ia567ff7342d1b1284f3161e8dea73b8b086fdb22
* | | am ab1d3048: Merge "Fix two issues in the media_profiles.xml file for ↵James Dong2011-11-081-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | crespo:" into ics-mr1 * commit 'ab1d30487ebeed006a73ddfc8227fdbd88d5af5d': Fix two issues in the media_profiles.xml file for crespo:
| * | Merge "Fix two issues in the media_profiles.xml file for crespo:" into ics-mr1James Dong2011-11-071-6/+6
| |\ \
| | * | Fix two issues in the media_profiles.xml file for crespo:James Dong2011-11-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. preview size 800x480 is not supported, change it to 720x480 2. the min frame rate 1fps is not supported, change it to 15fps Note the back camera on Nexus S supports 30 fps only, and the front camera supports 15 fps only, although variable frame rate is actually being used. Change-Id: I98afffa4d5b94e84fe11e0c60a63d2c7f23cc0d1 related-to-bug: 5554152
* | | | am 56cd1b45: Update EEPROM for FW 109.12, and enable low power polling retry ↵Nick Pelly2011-11-071-6/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | mechanism. * commit '56cd1b452a511e0ed76fdad317d41fdb19b19245': Update EEPROM for FW 109.12, and enable low power polling retry mechanism.
| * | | Update EEPROM for FW 109.12, and enable low power polling retry mechanism.Nick Pelly2011-11-071-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4 retries. Bug: 5515083 Change-Id: I9d2d0227e5280acc27f31dd14e539052a3e00268
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Ie799db3e01c5f0931c1d8c35f1f113df72a58cbc
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | am 068a8657: Merge "NFC: HAL for crespo/crespo4g" into ics-mr1Martijn Coenen2011-11-073-0/+161
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '068a86572c126591ff819f38a7124efcb875d575': NFC: HAL for crespo/crespo4g
| * | | Merge "NFC: HAL for crespo/crespo4g" into ics-mr1Martijn Coenen2011-11-073-0/+161
| |\ \ \ | | |/ / | |/| |
| | * | NFC: HAL for crespo/crespo4gMartijn Coenen2011-11-043-0/+161
| | | | | | | | | | | | | | | | Change-Id: If29df4a0a9697d7066f9f21f5fbdc29d9042c387
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Icc2095a4a7056db669f1135ff4e62a7c386e521d
| * | | kernel + wifi prebuild update (pvr no reset, more usb devs)JP Abgrall2011-11-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ad96cf arch: herring_defconfig: Enable more input devices. cd0ac4f gpu: pvr: Temporarily disable PVRSRV_RESET_ON_HWTIMEOUT. Change-Id: I6397357758e80d4aae98e4d9c8b4bb414f88d465
| * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-030-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| | |\ \
* | | \ \ am f9a8cbcf: Merge "5PC11X: CAMERA: Fix CTS fail list Fix Issue 4905016 - ↵James Dong2011-11-041-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | android.hardware.cts.CameraTest.testPreviewCallbackWithBufferByCamera fails Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>" into ics-mr1 * commit 'f9a8cbcfffd293acfe6621338377f076e2960599': 5PC11X: CAMERA: Fix CTS fail list Fix Issue 4905016 - android.hardware.cts.CameraTest.testPreviewCallbackWithBufferByCamera fails Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
| * | | | Merge "5PC11X: CAMERA: Fix CTS fail list Fix Issue 4905016 - ↵James Dong2011-11-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | android.hardware.cts.CameraTest.testPreviewCallbackWithBufferByCamera fails Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>" into ics-mr1
| | * | | | 5PC11X: CAMERA: Fix CTS fail listkyoungho.yun2011-11-031-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Issue 4905016 - android.hardware.cts.CameraTest.testPreviewCallbackWithBufferByCamera fails Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com> Change-Id: Iab8ed4b79379c148c106b00c4966c5f72f3ded33 related-to-bug: 5550399,5550524,5550858,5550860,5551018,5550902,
generated by cgit v1.1 at 2024-12-23 06:52:05 +0000