aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | | | | | | | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4990431dfab2f2573ec4ddd97cf656a674ca9d07': Merge from 491e6d on master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40c8d18f4fdbceb63d64520ac7650b4f6ecd52bb': Merge from c3b969ab on master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffb88b0da4df3d6a2db80670a176397db5ff6515': CherryPick from 3d3fea0 in master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcc9f5fc3b08c2eb932d75b21b546e60527c7499': Merge from 5f8faae on master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bed87f42f0001a3217ab005e728ef5b2e3a6fe14': Merge from c68dbbe in master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16d2d4368c404a3a60f92e120ee889d36aaa3ebb': Merge from e3b840cf on master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fe757971: (-s ours) Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe757971b56e30878aeea876bf5d5704b081d4ea': Merge a83cf90 from master. Do not merge.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0ae42fc7: (-s ours) Merge 6ef999d from master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ae42fc7042ab59b2d7a17a59c4ba8470cadb2d6': Merge 6ef999d from master. Do not merge.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrap IRQs for x86 system image.Vladimir Chtchetkine2011-10-241-0/+14
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary fix that enables GoogleTV emulation on tools R15+ The permanent solution would be to increase number of available IRQs from 16 to something more appropriate. For now just: 1. Use IRQ3 for the events device. 2. Decrease number of TTY ports from 4 to 2. These two measures would free up 3 IRQs, so the chances of running out of available IRQs are significantly decreased. Change-Id: Ie788880935d6e15f1f02f61e862c8727c8690b4a
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcc9f5fc3b08c2eb932d75b21b546e60527c7499': Merge from 5f8faae on master. Do not merge.
| * | | | | | | | | | | | | | | | Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-09-232-13/+32
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that first two cameras are facing in opposite direction. Currently camera app will crash on an attempt to switch cameras if camera 0 and 1 are facing in the same direction. So, user should be warned about that on emulator start. Change-Id: I6211093296806cb03be02e543e21154508693eab
* | | | | | | | | | | | | | | | Merge "Check that first two cameras are facing in opposite direction."Vladimir Chtchetkine2011-09-232-13/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Check that first two cameras are facing in opposite direction.Vladimir Chtchetkine2011-09-232-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently camera app will crash on an attempt to switch cameras if camera 0 and 1 are facing in the same direction. So, user should be warned about that on emulator start. Change-Id: Ic85da614d30295b04d2a318fb1c2015cc52f1140
* | | | | | | | | | | | | | | | am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-09-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | * commit 'bed87f42f0001a3217ab005e728ef5b2e3a6fe14': Merge from c68dbbe in master. Do not merge.
| * | | | | | | | | | | | | | Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-09-236-24/+64
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeout frame capturing. It has been observed on some of the MS camera devices, that device may got stuck on something that would alwais return EAGAIN when queried for the next video frame. This requires us to timeout the loop that repeats attempts to acquire first frame from the device. Also added detection and reporting of I/O errors occurred during frame capturing. Also, this CL contains some cosmetick changes to error and warning reporting. Change-Id: I90e4c664734e8980f1e2ee5ee5cf43a651503dc7
* | | | | | | | | | | | | | Timeout frame capturing.Vladimir Chtchetkine2011-09-236-24/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been observed on some of the MS camera devices, that device may got stuck on something that would alwais return EAGAIN when queried for the next video frame. This requires us to timeout the loop that repeats attempts to acquire first frame from the device. Also added detection and reporting of I/O errors occurred during frame capturing. Also, this CL contains some cosmetick changes to error and warning reporting. Change-Id: I81edaf5ff8bfe147dbe4510e1446e77a87817f37
* | | | | | | | | | | | | | am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16d2d4368c404a3a60f92e120ee889d36aaa3ebb': Merge from e3b840cf on master. Do not merge.
| * | | | | | | | | | | | | Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-09-221-9/+40
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly reset camera device between capture requests Change-Id: I1f283b90d08b59cd4dd94f569a8c31c1ab574d37
* | | | | | | | | | | | | am fe757971: (-s ours) Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-09-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe757971b56e30878aeea876bf5d5704b081d4ea': Merge a83cf90 from master. Do not merge.