summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add empty Android.mk for symmetryJean-Baptiste Queru2011-06-281-0/+0
| | | | Change-Id: Ic7ac46e1a4a79775caf251417301a8dec78a5463
* Merge "Deal with apks, if necessary"Jean-Baptiste Queru2011-06-281-0/+8
|\
| * Deal with apks, if necessaryJean-Baptiste Queru2011-06-241-0/+8
| | | | | | | | Change-Id: Ic41900bdd15c04465bd04c7e7b85fb6d1a05a5af
* | Merge "New NFC firmware location"Jean-Baptiste Queru2011-06-281-1/+1
|\ \ | |/
| * New NFC firmware locationJean-Baptiste Queru2011-06-241-1/+1
| | | | | | | | Change-Id: Ieedc5c6f03561495fc2722827331c7b82fa988fa
* | libcamera: for checking invalid parametersJeong-Seok Yang2011-06-282-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4353744 android.hardware.cts.CameraTest#testInvalidParameters fails must fix android.hardware.cts.CameraTest#testInvalidParameters was failed when checking focus mode with invalid parameter because if the camera didn't set scene mode, libcamera didn't check if the focus mode is valid or not. Add checking the parameter at that time. Change-Id: I22fb02b7fcfcdb7f5638adf91d5bfd881c0d89e1 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* | Crespo front camera supports only up to 15 frames per secondJames Dong2011-06-271-2/+2
| | | | | | | | | | Change-Id: I02da9ff74e6822e6cb5b65ecc6e1505603b5f612 related-to-bug: 4363150
* | New kernel and wifi driver (gpu driver + qtaguid filter)JP Abgrall2011-06-242-0/+0
|/ | | | | | | | | | | 1ffa0f9 gpu: pvr: Update to DDK 1.8.18.684 d6cffc3 herring_defconfig: update to enable qtaguid netfilter and deps. 9b8a010 netfilter: qtaguid: adapt for 2.6.35 884270d netfilter: add xt_qtaguid matching module a9f95b8 netfilter: have ip*t REJECT set the sock err when an icmp is to be sent Change-Id: Iac7941bba3f4d0421516a414f86f1fbe58720281 Signed-off-by: JP Abgrall <jpa@google.com>
* Merge "Install NFC firmware if available."Nick Pelly2011-06-241-0/+2
|\
| * Install NFC firmware if available.Nick Pelly2011-06-241-0/+2
| | | | | | | | Change-Id: I51649984dfbaad7b74bcac6f30f0348659f0ffc1
* | Use 24 bit color for crepso.Michael Ward2011-06-241-0/+1
| | | | | | | | | | | | This gets around a line_length bug for crespo. Change-Id: Idad3639cc2992d34d10d687dc1fea1adc049e15f
* | New location for NXP firmwareJean-Baptiste Queru2011-06-241-1/+1
| | | | | | | | Change-Id: I4923207cb7c2f1a4a7e61e27f481b56d85663ae4
* | Merge "auto-generated blob-handling scripts"Jean-Baptiste Queru2011-06-242-4/+4
|\ \
| * | auto-generated blob-handling scriptsJean-Baptiste Queru2011-06-232-4/+4
| | | | | | | | | | | | Change-Id: I14b36dad48947c3af2976b7572641941021dad72
* | | Add Video Editor to crespo buildShih-chia Cheng2011-06-241-0/+4
| | | | | | | | | | | | Change-Id: I01dcfbfe135dbc5a7f8054cbcca23db157cc4fff
* | | New kernel and wifi driverBenoit Goby2011-06-232-0/+0
|/ / | | | | | | | | | | | | edb3830 usb: gadget: s3c: Don't connect USB before gadget driver is ready 9809242 pn544: Increase GPIO toggle delays again as per experimental results Change-Id: Ic7d6f88368c8846ec6b489bc71783cbafa9b039d
* | Merge "Fix keylayouts for ICS."Jeff Brown2011-06-234-4/+39
|\ \ | |/ |/|
| * Fix keylayouts for ICS.Jeff Brown2011-06-234-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Crespo devices have a single combined touchscreen and use the framework virtual key support instead of having a separate capacitive keypad sensor. The default key layout changed in Honeycomb which had the effect of breaking the HOME key on these devices. Added a new key layout to explicitly map the virtual keys. Also fixed an old key layout that used obsolete syntax. Bug: 4901533 Change-Id: I3281b516ea44a150ec85da29bc5f0f3c00da2e6b
* | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-230-0/+0
|\ \ | |/ |/| | | Change-Id: I6bb7099a973c4c82e71121dd1af280848a001bf7
| * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-160-0/+0
| |\
* | \ resolved conflicts for merge of 40717996 to masterRobert Greenwalt2011-06-221-9/+9
|\ \ \ | | | | | | | | | | | | Change-Id: I36d3e5330eff7580dc2bf28c076062de4b418561
| * \ \ am 39354845: Fix Tethering configurationRobert Greenwalt2011-06-201-10/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '39354845be78fd5d74bec3916355a518ebfbd506': Fix Tethering configuration
| | * | | Fix Tethering configurationRobert Greenwalt2011-06-171-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old scheme was too imprecise. bug:4530116 Change-Id: I0f172cbe023226731d5011c3564c7006e153edba
* | | | | Merge "Fix for encode timestamp issue."James Dong2011-06-213-19/+19
|\ \ \ \ \
| * | | | | Fix for encode timestamp issue.SeungBeom Kim2011-06-213-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9ac27f9510ef6017ad2132a31382a66449d9b9e Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com> related-to-bug: 4724339
* | | | | | enable h/w accelerationMathias Agopian2011-06-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I695e7507a5dbb59d9378c3266190239c66b059f0
* | | | | | prebuilt kernel+wifi with netfilter qtaguid supportJP Abgrall2011-06-202-0/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on internal android-samsung-2.6.35 932e5c0 [ARM] S5PC11X: herring: Update defconfig for new USB gadget driver cb474bb [ARM] S5PC11X: herring: board file updates for new USB gadget driver 7e71a1a usb: gadget: gadget driver update for herring ... with unsubmitted e348ed3 netfilter: qtaguid: adapt for 2.6.35 add6dbb netfilter: add xt_qtaguid matching module e76f770 netfilter: have ip*t REJECT set the sock err when an icmp is to be sent Change-Id: I2cbdff814385000f18a479ee01ad8dd2a145e1ec Signed-off-by: JP Abgrall <jpa@google.com>
* | | | | libcamera: for preventing to open camera before releasing another cameraJeong-Seok Yang2011-06-192-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4363159 Opening some camera was successful before releasing another camera. Thus it has been fixed. It will return error if the situation is happened. Change-Id: Id177f7dd0a14b1f7bb72751f432f9b1afee77ede Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* | | | | Merge "libcamera: Increase memory buffer"Wu-cheng Li2011-06-191-1/+1
|\ \ \ \ \
| * | | | | libcamera: Increase memory bufferJeong-Seok Yang2011-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug fix : libcamera is crashed when capturing picture on back camera sometimes. It is caused by overflow the memory buffer. So, we increase the size of buffer to 5M. Change-Id: If72c06a77e8eaa9544d685c452121eefaa488db1 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* | | | | | Merge "New prebuilt kernel and wifi driver:"Mike Lockwood2011-06-172-0/+0
|\ \ \ \ \ \
| * | | | | | New prebuilt kernel and wifi driver:Mike Lockwood2011-06-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 932e5c0 [ARM] S5PC11X: herring: Update defconfig for new USB gadget driver cb474bb [ARM] S5PC11X: herring: board file updates for new USB gadget driver 7e71a1a usb: gadget: gadget driver update for herring Change-Id: If8dc4605fdbd64650dccbfcc61c00f2932b508ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "Set the rigth ownership of device /dev/s3c-mfc, which is used by ↵James Dong2011-06-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | video encoder"
| * | | | | | Set the rigth ownership of device /dev/s3c-mfc, which is used by video encoderJames Dong2011-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 4600191 Change-Id: Iebb501a9ddbc3b9de6f19b0eca78782d51f64c61
* | | | | | | Merge "Remove the tags app from crespo."Jeff Hamilton2011-06-172-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove the tags app from crespo.Jeff Hamilton2011-06-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4c6aa94eb2e0fca4a3ccf84f54849b9dd1ce522
* | | | | | | | USB and storage configuration for new USB gadget supportMike Lockwood2011-06-174-0/+92
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28987b6b3033099a5ba78f0e680581153b6e0ec4 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 3d5fe4b6: am 09ac6ef2: am e89ca68f: Require new TMobile/EUR and AT&T radiosEd Heyl2011-06-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | * commit '3d5fe4b61a871bed4821fa82ef0dd863d45630f1': Require new TMobile/EUR and AT&T radios
| * | | | | am 09ac6ef2: am e89ca68f: Require new TMobile/EUR and AT&T radiosEd Heyl2011-06-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09ac6ef20e16cc5a44d5cb88f1af9290f444796b': Require new TMobile/EUR and AT&T radios
| | * \ \ \ \ am e89ca68f: Require new TMobile/EUR and AT&T radiosEd Heyl2011-06-151-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'e89ca68fd2ef92da9588838ec70f015ad7b8b938': Require new TMobile/EUR and AT&T radios
| | | * | | | Require new TMobile/EUR and AT&T radiosEd Heyl2011-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib558f9bf59c213694e64b0472894037bfae6f857
* | | | | | | libcamera: Change camera.herring.so from camera.s5pc110.soJeong-Seok Yang2011-06-143-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crespo: libcamera is for only herring not boards what are based on s5pc110. So the module name is changed to camera.herring.so from camera.s5pc110.so Change-Id: Ie2231ecfd4c97dd72fba8258e489f90df27b9f51 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* | | | | | | Disable HW acceleration for Launcher on crespoMichael Jurka2011-06-141-0/+3
| | | | | | |
* | | | | | | Merge "auto-generated blob-handling scripts"Jean-Baptiste Queru2011-06-132-0/+52
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | auto-generated blob-handling scriptsJean-Baptiste Queru2011-06-102-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e0a4eea6d37a07252dde8141a8b708d5eaf3ba6
* | | | | | | crespo camera: software work-around to enable camcorderIliyan Malchev2011-06-112-53/+112
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hack does two things: -- it sets preview to NV21 (YUV420SP) -- it sets gralloc to YV12 The reason being: the samsung encoder understands only yuv420sp, and gralloc does yv12 and rgb565. So what we do is we break up the interleaved UV in separate V and U planes, which makes preview look good, and enabled the encoder as well. FIXME: Samsung needs to enable support for proper yv12 coming out of the camera, and to fix their video encoder to work with yv12. FIXME: It also seems like either Samsung's YUV420SP (NV21) or img's YV12 has the color planes switched. We need to figure which side is doing it wrong and have the respective party fix it. Change-Id: Ib300b560ecce969c68105ad5e2abe88a5e33ae1f Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | | Merge "Advertise mifare feature on all crespo builds"Jean-Baptiste Queru2011-06-101-0/+1
|\ \ \ \ \ \
| * | | | | | Advertise mifare feature on all crespo buildsJean-Baptiste Queru2011-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff2b4c3cbdaec8664e1c22fe3433811f00a6d755
* | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | Change-Id: Iaef6ac2741407d98f18e68c70b82d0af31ac874d
| * | | | | keep historyandroid-merger2011-06-100-0/+0
| |\ \ \ \ \
generated by cgit v1.1 at 2024-12-23 09:02:18 +0000