aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reconcile with honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ | | | | | | Change-Id: Id7ed4b392060d34981e51f60b5b407b6989737e6
| * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| |\
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | |\
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | | |\
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | | | |\
| | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | | | | |\
| | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-150-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-070-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-050-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-040-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-010-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | |/ /
| | | | | | | | | | | * keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | |/ | | | | | | | | | | |/|
* | | | | | | | | | | | Merge "Add support for xhdpi when injecting a skin dpi into the emulator."David Turner2011-05-172-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add support for xhdpi when injecting a skin dpi into the emulator.Xavier Ducrohet2011-05-172-8/+11
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58f06af3c39efc1fcc7dd4e53a701136229379de
* | | | | | | | | | | | Merge "Dump hardware config. with -verbose option."David 'Digit' Turner2011-05-164-0/+321
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Dump hardware config. with -verbose option.David 'Digit' Turner2011-05-144-0/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch dumps the content of the hardware configuration file when the -verbose option (or equivalent -debug-init) is used. This is useful to determine exactly what is launched when debugging emulator issues. Change-Id: I101b87cddb12c603b43420ea72bb357fc33f327d
* | | | | | | | | | | | | Merge "Fix the pc-bios search path for build trees."David 'Digit' Turner2011-05-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix the pc-bios search path for build trees.David 'Digit' Turner2011-05-141-2/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the routine that looks for the x86 BIOS file(s) when running from the build tree (i.e. typing 'emulator' just after building the full_x86-eng product). Turns out that the files are installed under out/host/<system>/usr/share/pc-bios by our build scripts. Change-Id: I51ae849d5cdf130558d05f2386c4175dfea1e054
* | | | | | | | | | | | Merge "Fix SDCard speed issues too."David 'Digit' Turner2011-05-121-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix SDCard speed issues too.David 'Digit' Turner2011-05-121-4/+8
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like we also need to set the 'cache' property to 'unsafe' when initializing the SDCard block device. Otherwise it will be mounted as O_DIRECT, making all i/o operations on the SD Card extremely slow. Change-Id: Id1a72f926c73dc6981a568f005f19cfc50f724d5
* | | | | | | | | | | | Merge "console: Fix 'event send' handling."David 'Digit' Turner2011-05-102-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | console: Fix 'event send' handling.David 'Digit' Turner2011-05-092-4/+10
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes two bugs in the implementation of the 'event send' command: 1/ It prevents a crash when using the '0:0:0' event triple (note that the equivalent EV_SYNC:0:0 used in testing didn't crash) 2/ If fixes the parser to correctly handle several event triples on the same line, as in: event send <type1>:<code1>:<value1> <type2>:<code2>:<value2> ... Change-Id: I26cb55dd2feb75fda4f50ba0d49c7c8ad8a9dcca
* | | | | | | | | | | Merge "Fix -snapshot-list option."David 'Digit' Turner2011-05-052-1/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix -snapshot-list option.David 'Digit' Turner2011-05-052-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes -snapshot-list work properly. More specifically: - If the AVD has snapshotting enabled, the emulator will find the appropriate file if you don't use -snapstorage. - If the AVD has no snapshot support, the emulator will print a user-friendly message to explain that. - If you're in the Android build, the emulator indicates that -snapstorage <file> is mandatory. Bug 4384430 Change-Id: I472b12f50b7f7da5a282b24036083c7598fe48eb
* | | | | | | | | | | | Merge "Fix emulator audio."David 'Digit' Turner2011-05-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix emulator audio.David 'Digit' Turner2011-05-051-0/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio support was compiled in, but never initialized because the hardware init function is in a different module and required HAS_AUDIO to be defined too. Change-Id: I57eccfb3a0abea86c29a9046f9f35d482a99c1f5
* | | | | | | | | | | | Merge "Fix "avd name" bug."David 'Digit' Turner2011-05-051-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix "avd name" bug.David 'Digit' Turner2011-05-051-4/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The console's 'avd name' command returned "unknown" incorrectly. This was due to a missing option when invoking the core, even in the standalone case. Fixes bug 3454261 Change-Id: I5d4e346591e13bd7f525ad81953fd2d17c8f27b7 NOTE: This is similar to the tools_r10 quick fix at https://review.source.android.com/#change,22735, only simpler.
* | | | | | | | | | | merge from tools_r11The Android Open Source Project2011-05-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c7d3f7880d10ca6d79378921a3f8811288770fa
| * \ \ \ \ \ \ \ \ \ \ Merge "Merge "Fix ANDROID_SDK_HOME handling."" into tools_r11Raphaƫl Moll2011-05-041-12/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge "Fix ANDROID_SDK_HOME handling."David 'Digit' Turner2011-05-041-12/+5
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous patch introducing the "emulator" launcher program did regress the way ANDROID_SDK_HOME is parsed. Fix that by actually trusting bufprint_config_path() to always do the right thing :-) (Merged from original id: I11a13fea95727ee9c487595fd4ae5e81805986da) Change-Id: I999de28a1cba530bc48e4219e5586ae20d80127b
* | | | | | | | | | | | Merge "Fix ANDROID_SDK_HOME handling."David 'Digit' Turner2011-05-041-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix ANDROID_SDK_HOME handling.David 'Digit' Turner2011-05-041-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous patch introducing the "emulator" launcher program did regress the way ANDROID_SDK_HOME is parsed. Fix that by actually trusting bufprint_config_path() to always do the right thing :-) Change-Id: I11a13fea95727ee9c487595fd4ae5e81805986da
* | | | | | | | | | | | Merge "Correct fix for snapshot saving speed"David 'Digit' Turner2011-05-042-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Correct fix for snapshot saving speedDavid 'Digit' Turner2011-05-042-2/+20
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEMU is a weird animal. The "snapshot" property speeds-up snapshot saving but also redirect all stores to a temporary file which is deleted when the emulator exit. Use a different property to get the desired speed-up. Note that using "writeback" instead of "unsafe" forces the use of fdatasync() which will still be horribly slow. + Argument checking in avd snapshot commands in the console. (trying to load a name-less snapshot actually crashes the emulator). Change-Id: Ie61f110f037bbb3539c7f9892cb03bee8bfec6bd
* | | | | | | | | | | | Merge "Fix snapshot save pathetic speed."David 'Digit' Turner2011-05-041-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix snapshot save pathetic speed.David 'Digit' Turner2011-05-041-1/+6
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that the 'snapshot' property must be turned on on the block device corresponding to the snapshot storage file. Otherwise, the file is mounted O_DIRECT, which on my speedy machine limits the operation to a max of about 2.5 MB/s. This explains why saving snapshots was so pathetic. With this change, the save throughput is up to 278 MB/s on the same machine! Change-Id: I77c792114171a4ecaf3e3f08f64d8b3a30709f23
* | | | | | | | | | | Merge "Document new QEMU pipe implementation."David 'Digit' Turner2011-05-045-3/+227
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Document new QEMU pipe implementation.David 'Digit' Turner2011-05-045-3/+227
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Rename android/pipe-net.c to android/hw-pipe-net.c Change-Id: Ia2e2466c3bf3ea812f36639420fad7ce2e0cb61d