aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fix -qemu -vnc startup.David 'Digit' Turner2011-04-275-7/+24
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting the emulator with something like "-qemu -vnc :1" didn't result in a valid boot sequence, due to the way our "hw-control" service is initialized. This patch fixes the issue. Note however that since a VNC client cannot send proper touch events, it can only be used as a viewer at the moment. Change-Id: Ib9b60ff7028892368547bff89b84f580344c2edd
* | | | | reconcile tools_r10 into master - no actual changeThe Android Open Source Project2011-04-210-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Change-Id: I179f483236174b19ca88a2b4b0dac6c8a94c0a99
| * | | | Merge "Fix touch emulation for tools_r10 emulator." into tools_r10David 'Digit' Turner2011-03-213-0/+36
| |\ \ \ \
| | * | | | Fix touch emulation for tools_r10 emulator.David 'Digit' Turner2011-03-213-0/+36
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in the previous commit because the values of the android_display_width and android_display_height variables are not properly initialized when events_dev_init() is called. The variables contain their default values (640 and 480) instead of anything specific to the device's skin/emulated LCD. The result is that touch emulation doesn't work well if the screen is not exactly 640x80, because reported touch events are then incorrectly scaled. NOTE: The problem doesn't exist in the master branch, which fixed the issue with a different patch, which takes care of the core/ui separation work to do stuff the right way(TM). This adds a tools_r10-specific patch to fix the issue. Change-Id: Idc1902db5d1b2c596aadc352e62c6523922d7a20
| * | | | Merge "Fix touchscreen emulation to return correct min/max coordinate ↵David 'Digit' Turner2011-03-181-0/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | bounds. DO NOT MERGE" into tools_r10
| | * | | | Fix touchscreen emulation to return correct min/max coordinate bounds. DO ↵David 'Digit' Turner2011-03-181-0/+40
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE This is needed by future changes in the input framework that depend on touchscreen devices to properly return the min/max bounds of their absolute pointer coordinates. Fixes bug 4126574 Change-Id: Iad3c8b9c78f69180ee5466cde0dbba557cb7d5c1
* | | | | Merge "Add support for hw.lcd.backlight"David Turner2011-04-153-1/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add support for hw.lcd.backlightTim Wan2011-04-153-1/+18
|/ / / / | | | | | | | | | | | | Change-Id: I02dc12caa76c86de5d294b6fc857ae37b74f0130
* | | | Merge "Converted a variable from char * to const char *. Removes compiler ↵David Turner2011-04-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | warnings with some compilers."
| * | | | Converted a variable from char * to const char *.Ashish Bhatia2011-04-081-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Removes compiler warnings with some compilers. Change-Id: Idfb14557181e744d07bef6b5d0da734012d2ff42
* | | | Merge "vl-android.c: Init opengles pipe on startup"David 'Digit' Turner2011-04-111-0/+4
|\ \ \ \
| * | | | vl-android.c: Init opengles pipe on startupDavid 'Digit' Turner2011-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I14c03c193166c214ce406a3dc524b8dfa16fa733
* | | | | Merge "hw/android_arm.c: Initialize qemud pipes properly."David 'Digit' Turner2011-04-111-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | hw/android_arm.c: Initialize qemud pipes properly.David 'Digit' Turner2011-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f7f46b6e9526d207f53ad6a9e6baa315bd6af7b
* | | | | Merge "Add OpenGLES pipe implementation."David 'Digit' Turner2011-04-112-0/+789
|\ \ \ \ \ | |/ / / /
| * | | | Add OpenGLES pipe implementation.David 'Digit' Turner2011-04-112-0/+789
| | | | | | | | | | | | | | | | | | | | Change-Id: I3ad498380de8438dbf430316af2d4391876057cc
* | | | | Merge "goldfish_trace: Hook with goldfish_pipe.h functions."David 'Digit' Turner2011-04-113-36/+102
|\ \ \ \ \ | |/ / / /
| * | | | goldfish_trace: Hook with goldfish_pipe.h functions.David 'Digit' Turner2011-04-113-36/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this is also forces tracing support during machine initialization. Measurements show that this doesn't have any significant impact on emulation performance. Change-Id: Ie32352659611531ce65ba2c95c5896e2421f509d
* | | | | Merge "hw/goldfish_pipe.c: New support code for QEMUD fast-pipes."David 'Digit' Turner2011-04-113-0/+839
|\ \ \ \ \ | |/ / / /
| * | | | hw/goldfish_pipe.c: New support code for QEMUD fast-pipes.David 'Digit' Turner2011-04-113-0/+839
| | | | | | | | | | | | | | | | | | | | Change-Id: I338334d53fa9bc52c87e9da18341d0cb94fd4269
* | | | | Merge "qemud: prevent recursive closure of clients."David 'Digit' Turner2011-04-113-8/+36
|\ \ \ \ \ | |/ / / /
| * | | | qemud: prevent recursive closure of clients.David 'Digit' Turner2011-04-113-8/+36
|/ / / / | | | | | | | | | | | | | | | | | | | | + add android/hw-qemud-pipe.h Change-Id: Icf7b316137cd9f1ce46e4c3642addccea6222a24
* | | | Merge "Simplify async utils by removing extra LoopIo parameter."David 'Digit' Turner2011-04-1110-49/+76
|\ \ \ \
| * | | | Simplify async utils by removing extra LoopIo parameter.David 'Digit' Turner2011-04-1110-49/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the LoopIo parameter from asyncReader_run() by storing the initial pointer passed to asyncReader_init() inside the object itself. Same treatment is performed for: - AsyncReader - AsyncWriter - AsyncLineReader - AsyncConnector - AsyncConsoleConnect Change-Id: Ic74b817e4c326230ca1d38b3a5d8c4790c4f90c1
* | | | | Merge "<android/utils/assert.h>: Small refactoring"David 'Digit' Turner2011-04-111-23/+73
|\ \ \ \ \ | |/ / / /
| * | | | <android/utils/assert.h>: Small refactoringDavid 'Digit' Turner2011-04-111-23/+73
| | | | | | | | | | | | | | | | | | | | Change-Id: If69874ace211e043d82ffd8349f54396fd334e94
* | | | | Merge "Add <android/utils/intmap.h> which implements an integer-keyed map of ↵David 'Digit' Turner2011-04-113-0/+334
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | pointers."
| * | | Add <android/utils/intmap.h> which implements an integer-keyed map of pointers.David 'Digit' Turner2011-04-113-0/+334
|/ / / | | | | | | | | | This will be used later to support QEMUD fast pipes.
* | | Merge "Fix framebuffer width/height computation."David 'Digit' Turner2011-03-251-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix framebuffer width/height computation.David 'Digit' Turner2011-03-251-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug in the skin parsing code that computes the dimensions of the emulated framebuffer. The bug had the following symptoms: - The vertical framebuffer size reported by the 'events' device was always 640 (the default), independent of the skin's dimensions and emulated 'framebuffer' device dimensions. As such, all touch event Y coordinates were scaled by the system by 480/640 when running inside a HVGA screen. Change-Id: I8c67f011ee3929ef25cbf2c858ee800f277c516c
* | Merge "Set hw.keyboard.lid default value to false for API level >= 12"David 'Digit' Turner2011-03-237-60/+291
|\ \
| * | Set hw.keyboard.lid default value to false for API level >= 12David 'Digit' Turner2011-03-227-60/+291
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the emulator to extract the target API level for the AVD or the current platform release, and use it to set the default value of hw.keyboard.lid. This will *not* affect any existing AVD/platform that sets the value explicitely in its config.ini (for AVDs) or hardware.ini (for platform builds). The change is beneficial for platform builds targetting API level >= 12, because the input framework changed its the window orientation behaviour depending on the availability of a hardware lid. In short, this allows platform builds to be correctly oriented, even if they don't provide a custom hardware.ini. Fix for bug 4128604 Change-Id: I195135aae6f3c4cc11d2f01e1293f3cd6cad2f58
* | Merge "Revert "Revert "Merge 29e114d2 from master."""Xavier Ducrohet2011-03-181-0/+36
|\ \
| * | Revert "Revert "Merge 29e114d2 from master.""Xavier Ducrohet2011-03-181-0/+36
|/ / | | | | | | | | | | | | | | | | This reverts commit 2facea6512c84af9285682909f6ac6edcd4130ab which was not supposed to merge down from tools_R10 to master since the original reverted commit was a cherry-pick from master to tools_r10 Change-Id: Ide87af693a0f3239bacaa7313b9262e6e8c46800
* | merge from tools_r10The Android Open Source Project2011-03-181-36/+0
|\ \ | |/ | | | | Change-Id: I70d9ccafb5912c85baa0711f7e9010bec223efaa
| * Merge "Revert "Merge 29e114d2 from master. do not merge."" into tools_r10Xavier Ducrohet2011-03-181-36/+0
| |\
| | * Revert "Merge 29e114d2 from master. do not merge."Xavier Ducrohet2011-03-181-36/+0
| |/ | | | | | | This reverts commit e36a1cc2561b2ce27d3c0a5b3a7b79d4e8531f0e.
* | merge from tools_r10The Android Open Source Project2011-03-180-0/+0
|\ \ | |/ | | | | Change-Id: Ie201fb1ced829ca29a46210b68fbb1d7dccfba9a
| * Merge "Merge 29e114d2 from master. do not merge." into tools_r10Xavier Ducrohet2011-03-181-0/+36
| |\
| | * Merge 29e114d2 from master. do not merge.David 'Digit' Turner2011-03-181-0/+36
| |/ | | | | | | | | | | | | | | | | | | | | | | Fix touchscreen emulation to return correct min/max coordinate bounds. This is needed by future changes in the input framework that depend on touchscreen devices to properly return the min/max bounds of their absolute pointer coordinates. Fixes bug 4126574 Change-Id: I1ace56d5433be5d97eb79895cd57b6e442245ca0
* | Merge "Fix touchscreen emulation to return correct min/max coordinate bounds."David 'Digit' Turner2011-03-181-0/+36
|\ \
| * | Fix touchscreen emulation to return correct min/max coordinate bounds.David 'Digit' Turner2011-03-181-0/+36
|/ / | | | | | | | | | | | | | | | | | | This is needed by future changes in the input framework that depend on touchscreen devices to properly return the min/max bounds of their absolute pointer coordinates. Fixes bug 4126574 Change-Id: I982c0d8e78fc59912e964af958929d2b0718eaa4
* | Merge "Fix -shell and -logcat options."David 'Digit' Turner2011-03-171-1/+5
|\ \
| * | Fix -shell and -logcat options.David 'Digit' Turner2011-03-181-1/+5
|/ / | | | | | | | | | | They didn't work because the guest was trying to write to the wrong serial port. Change-Id: Ibd68c4b63d0808afcb0cfaffa07c35898e21df9a
* | Merge "Fix write of disk sizes in ini files."David 'Digit' Turner2011-03-161-11/+14
|\ \
| * | Fix write of disk sizes in ini files.David 'Digit' Turner2011-03-151-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | The old implementation always expressed the size as multiples of kilobytes due to an improper order to size checks. For example, 66MB was written as '67584k' instead of '66m', which is correct but sub-optimal. Change-Id: I6365bf4c269ed7d213043182a8ae501713798b8f
* | | Merge "Fix a crash that happened when the content directory didn't have a ↵David 'Digit' Turner2011-03-152-13/+24
|\ \ \ | |/ / |/| | | | | cache.img file."
| * | Fix a crash that happened when the content directory didn't have a cache.img ↵David 'Digit' Turner2011-03-152-13/+24
|/ / | | | | | | | | | | | | | | | | file. This only happened for fresh newly-created AVDs. Existing ones used for testing the emulator already had a cache.img and booted properly. Change-Id: I87901ea5fb1dc6aa7d2bb3dd191de58d972c386f
* | Merge "Fix windows build when USE_CCACHE is defined."David 'Digit' Turner2011-03-141-0/+1
|\ \
| * | Fix windows build when USE_CCACHE is defined.David 'Digit' Turner2011-03-121-0/+1
|/ / | | | | | | | | | | | | This avoids a problem where the Makefile force the use of the non-existing prebuilt/windows/ccache/ccache. Change-Id: Icad0fb91a211787bbe73b169aa4e8046de349679