aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
|\
| * merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| |\
| | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | |\
| | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-080-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | |/|
* | | | | | | | | | | | | | | | | | | Fix emulator crash.Vladimir Chtchetkine2011-10-211-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f238bbd0175036b6003ebdf266de608d6acc6e7
* | | | | | | | | | | | | | | | | | | Bound loop indexVladimir Chtchetkine2011-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases (when frame sizes for pixel formats are not available) the loop will be not properly bounded, and may cause a crash. Change-Id: I2f2380ab4e2f7454bff8eeabcaff4e3f238fe71e
* | | | | | | | | | | | | | | | | | | Fix emulator crash caused by bad 'printf'Vladimir Chtchetkine2011-10-202-3/+3
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c4830ba7606bedcf462e967adad3358723c44ba
* | | | | | | | | | | | | | | | | | Fix http proxy to deal with chunked body encoding properly.David 'Digit' Turner2011-10-171-35/+68
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the HTTP rewriter to deal with chunked encoding properly. The old code didn't handle the end of chunk data properly (it must be followed by \r\n which was ignored by the previous code). See http://tools.ietf.org/html/rfc2616#section-3.6.1 for details. Fix for b/5033498 Change-Id: I385c632ab7b550257b7b241948c30e5fe444b7cd
* | | | | | | | | | | | | | | | | Merge "Implemented Mac camera emulation"Vladimir Chtchetkine2011-10-134-88/+551
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Implemented Mac camera emulationVladimir Chtchetkine2011-10-124-88/+551
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01609e8bfcdd8ee5ef876344d0a334ecd69a2b7a
* | | | | | | | | | | | | | | | | Fix -wipe-data optionVladimir Chtchetkine2011-10-131-1/+12
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forces overwriting (truncating) of the userimage-qemu.img file on condition that it is being initialized from userimage.img file. If *-qemu file is not truncated the system will pick up on artifacts located behind the overwritten area of the *-qemu.img file. Change-Id: I091dff0069d7049588b11c4654fe134947db101b
* | | | | | | | | | | | | | | | am 9f3c0c76: (-s ours) Cherry-pick d0e2872 from master: Fix snapshots. do ↵Vladimir Chtchetkine2011-10-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge. * commit '9f3c0c76682640cf6583b1b0babb23e9038a8d71': Cherry-pick d0e2872 from master: Fix snapshots. do not merge.
| * | | | | | | | | | | | | | | | Cherry-pick d0e2872 from master: Fix snapshots. do not merge.Vladimir Chtchetkine2011-10-055-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8662ec8d2f38244bb8c727a1cd898c450ef5d051
* | | | | | | | | | | | | | | | | Fix snapshotsVladimir Chtchetkine2011-10-055-22/+27
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3891704ece2cea0c5a80b468b2514e6c4d13216
* | | | | | | | | | | | | | | | Merge "ANDROID-KERNEL.TXT: Update document"David 'Digit' Turner2011-10-041-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | ANDROID-KERNEL.TXT: Update documentDavid 'Digit' Turner2011-10-041-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames docs/KERNEL.TXT to docs/ANDROID-KERNEL.TXT and also updates the content with: - the new git repository and branch to use to get the kernel sources (android.git.kernel.org/kernel/qemu.git android-goldfish-2.6.29) - how to rebuild the ARMv7 kernel image (just use the --armv7 flag) Change-Id: I87cbbcbcbdfa2b9b0efaac6d3410a68ad336e5b3
* | | | | | | | | | | | | | | | | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | * commit 'a2f29cb6efc83df073e66a3cf2c7ba02709b4257': Cherrypick fa0c8e from master. do not merge.
| * | | | | | | | | | | | | | | Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-042-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New AVD property to control presence of hw main keys. This allows injecting a new runtime property into the system running on the emulator to control whether to display the new software back/home keys. Change-Id: I7d3a7ae681d1152f86a8bc7a036fd3ccf5be2e2a
* | | | | | | | | | | | | | | | New AVD property to control presence of hw main keys.Xavier Ducrohet2011-10-042-4/+12
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows injecting a new runtime property into the system running on the emulator to control whether to display the new software back/home keys. Change-Id: I2bf7cc5c291752090187463332219638e883d052
* | | | | | | | | | | | | | | am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fd262f1b4682a6d2dae0f61f6ea394d14f33c08': CherryPicked from d0b482e on master. Do not merge.
| * | | | | | | | | | | | | | CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-295-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix IRQ allocation for goldfish devices. There were two issues fixed here: 1. IRQ allocation (for a device) has never been checked on going out of bounds. 2. In x86 platform some IRQs were reserved (for kbd, mouse, and exception), but IRQ allocation for goldfish devices didn't check for those reserved IRQs being assigned to a device. Change-Id: I9abec0c093a43e1683539c96c9149f9bc6f4b051
* | | | | | | | | | | | | | | Fix IRQ allocation for goldfish devices.Vladimir Chtchetkine2011-09-295-4/+32
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two issues fixed here: 1. IRQ allocation (for a device) has never been checked on going out of bounds. 2. In x86 platform some IRQs were reserved (for kbd, mouse, and exception), but IRQ allocation for goldfish devices didn't check for those reserved IRQs being assigned to a device. Change-Id: I9d48485d973bcc8fd8a3dd1b78fbfa6a05aeea22
* | | | | | | | | | | | | | am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ae4139bbecc44a9d4210fde9de25f9acc1feff7': Merge from 33f89d0 on master. Do not merge.
| * | | | | | | | | | | | | Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-282-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CPU architecture reported in HW config Change-Id: I2d31168ca05e1214df708fd107143fa4908e2889
* | | | | | | | | | | | | | Fix CPU architecture reported in HW configVladimir Chtchetkine2011-09-282-1/+12
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9221916514a39435d2710fa9dada92a87bdc4dab
* | | | | | | | | | | | | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4990431dfab2f2573ec4ddd97cf656a674ca9d07': Merge from 491e6d on master. Do not merge.
| * | | | | | | | | | | | Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use different macro for KVM Change-Id: I6d53aac7de92d8991f7cf0cf34484a0083f642a5
* | | | | | | | | | | | | am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40c8d18f4fdbceb63d64520ac7650b4f6ecd52bb': Merge from c3b969ab on master. Do not merge.
| * | | | | | | | | | | | Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-271-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QEMU pipe on KVM The issue was that CPU registers (CR3 in particular) in QEMU were out of sync with KVM at the time when virtual address to physical address translation was performed. This caused translation failure, and the subsequent crash. The fix was to explicitly sync QEMU registers with KVM registers just before calling VA->PA translation. Change-Id: I469da1d95d1e2f10e372b100ba93cd448b4b4551
* | | | | | | | | | | | | Use different macro for KVMVladimir Chtchetkine2011-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62a2d54562ac043a5513585a2e86aa01038fdc29
* | | | | | | | | | | | | Fix QEMU pipe on KVMVladimir Chtchetkine2011-09-271-2/+17
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that CPU registers (CR3 in particular) in QEMU were out of sync with KVM at the time when virtual address to physical address translation was performed. This caused translation failure, and the subsequent crash. The fix was to explicitly sync QEMU registers with KVM registers just before calling VA->PA translation. Change-Id: I1ff4ed2cfddd77e6889bb645f08db442f119049a
* | | | | | | | | | | | am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffb88b0da4df3d6a2db80670a176397db5ff6515': CherryPick from 3d3fea0 in master. Do not merge.
| * | | | | | | | | | | CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-09-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix windows build Change-Id: I6b82dd84860a5b634fb5215a0ef250e9e13bc2a2
* | | | | | | | | | | | Merge "Fix windows build"Vladimir Chtchetkine2011-09-232-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix windows buildVladimir Chtchetkine2011-09-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7387eea3639d63b278b702100ee2d4584f87f4e2
generated by cgit v1.1 at 2025-01-11 21:48:24 +0000