summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| | * | | | | Custom kernel with data-usage support and persistence.JP Abgrall2011-06-102-0/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for a one-time build of Gingerbread MR3. Not for release. This kernel is based on https://partner.source.android.com/g/gitweb?p=kernel%2Fprivate%2Fsamsung.git;a=shortlog;h=refs%2Fheads%2Fandroid-samsung-2.6.35-gingerbread at commit 807fb588280ee28833ea7838e6fa79b9b14f66c1 with the needed iface_stat, udp, ... changes on top: https://review.source.android.com/#change,21605 https://review.source.android.com/#change,21093 Change-Id: I558a7f14258c3d6c497995880356bc5a4106de62 Signed-off-by: JP Abgrall <jpa@google.com>
* | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-100-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I9542e8948dd9c7e1b601e49799a879f32ab9f5ee
| * | | | | keep historyandroid-merger2011-06-090-0/+0
| |\ \ \ \ \
| | * | | | | Custom kernel with data-usage support and persistence.JP Abgrall2011-06-092-0/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for a one-time build of Gingerbread MR3. Not for release. This kernel is based on https://partner.source.android.com/g/gitweb?p=kernel%2Fprivate%2Fsamsung.git;a=shortlog;h=refs%2Fheads%2Fandroid-samsung-2.6.35-gingerbread at commit 807fb588280ee28833ea7838e6fa79b9b14f66c1 with the needed iface_stat, udp, ... changes on top: https://review.source.android.com/#change,21605 https://review.source.android.com/#change,21093 Change-Id: I558a7f14258c3d6c497995880356bc5a4106de62 Signed-off-by: JP Abgrall <jpa@google.com>
| * | | | | keep historyandroid-merger2011-06-060-0/+0
| |\ \ \ \ \
| | * | | | | Custom kernel with data-usage support and persistence.JP Abgrall2011-06-062-0/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for a one-time build of Gingerbread MR3. Not for release. This kernel is based on https://partner.source.android.com/g/gitweb?p=kernel%2Fprivate%2Fsamsung.git;a=shortlog;h=refs%2Fheads%2Fandroid-samsung-2.6.35-gingerbread at commit 807fb588280ee28833ea7838e6fa79b9b14f66c1 with the needed iface_stat, udp, ... changes on top: https://review.source.android.com/#change,21605 https://review.source.android.com/#change,21093 Change-Id: I558a7f14258c3d6c497995880356bc5a4106de62 Signed-off-by: JP Abgrall <jpa@google.com>
| * | | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-060-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Reconcile with gingerbread-mr2-releaseJean-Baptiste Queru2011-06-010-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5230a95dcb0960275e052dcbad2989a68574d7e
| | | * | | | | Re-order radio versions, also add missing UC radioJean-Baptiste Queru2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib79f021d8b3d440ae19f3290dcfd825a7d321443
| | | * | | | | resolved conflict after cherry-pick 3860092929b84c497499afa953e7c11d2ebf5e38Ed Heyl2011-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I002ee1fbe87004bda328328630ec09c30ab7f73c
| | * | | | | | keep historyandroid-merger2011-05-270-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ keep historyandroid-merger2011-05-270-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ keep historyandroid-merger2011-05-260-0/+0
| | | | |\ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | | * | | | | | keep historyandroid-merger2011-05-260-0/+0
| | | | |\ \ \ \ \ \ | | | |/ / / / / / /
| | | | * | | | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-250-0/+0
| | | | |\ \ \ \ \ \
* | | | | \ \ \ \ \ \ am 9a7f21bd: (-s ours) am 317a9213: am 7af59186: update kernelSimon Wilson2011-06-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a7f21bd1076a3702203b8d953df9058bc211d43': update kernel
| * | | | | | | | | | am 317a9213: am 7af59186: update kernelSimon Wilson2011-06-092-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '317a9213ef406347e72598fe11cbaba1a4651830': update kernel
| | * | | | | | | | | am 7af59186: update kernelSimon Wilson2011-06-092-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7af59186753f2c08ed4123e0d2693d0e11f48410': update kernel
| | | * | | | | | | | update kernelSimon Wilson2011-06-092-0/+0
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cc95e3 net: Reorder incoming packets in PPPoLAC and PPPoPNS. 3128bc4 jbd2: fix fsync() tid wraparound bug Change-Id: If6a22a320491d52ccbe6abb97acf5e97886fe144
* | | | | | | | | | Use PRODUCT_DEFAULT_PROPERTY_OVERRIDES instead of ADDITIONAL_DEFAULT_PROPERTIESMike Lockwood2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41ad17bfb11c594d20703e39fcc95b3c77f1039b Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2024-06-29 15:07:50 +0000