aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Merge c80340 from master to r13: Move charmap to hardware ↵Xavier Ducrohet2011-08-229-62/+73
| | | | | | | | | | | | | properties"..." This reverts commit cccd28ca5064a7bd14282cd774ee5bb7126d5845. c80340 add a CL to tools_r13 that broken the build. It was therefore reverted with cccd28. This revert was merged into tools_r13 but shouldn't have been. This reverts the revert to put back the CL in master. Change-Id: I95fcefedb77596cfdf76269f248b2ae80c85c830
* Merge "Fix an emulator crash due to closed qemud pipe"Vladimir Chtchetkine2011-08-191-25/+51
|\
| * Fix an emulator crash due to closed qemud pipeVladimir Chtchetkine2011-08-181-25/+51
|/ | | | | | | | | It looks like goldfish_pipe may make a call to the pipe after client has been disconnected and QemudClient instance freed. This results in a sudden death of the emulator, because _qemudPipe_recvBuffers doesn't know that the client for that call is gone. Change-Id: Ie1dd5481a01fd5bbb58d8c2d4e1bbe1ecfeca38a
* merge from tools_r13The Android Open-Source Project2011-08-180-0/+0
|\ | | | | | | Change-Id: I4994dd2e99378bfeeb1a88ba07742e205bf07a18
| * Merge "Fix internet connectivity of emulator over proxy" into tools_r13David Turner2011-08-181-7/+12
| |\
| | * Fix internet connectivity of emulator over proxyMatthias Thomae2011-08-181-7/+12
| |/ | | | | | | | | | | | | | | When trying to connect to a host on the internet using a proxy, the socket address was passed uninitialized to the proxy manager. The effects were similar to the ones described in Issue 18715. The change adds the socket address to the proxy manager after it has been initialized.
* | Merge "opengles: improve throughput of TCP socket"David Turner2011-08-151-16/+16
|\ \
| * | opengles: improve throughput of TCP socketDavid Turner2011-08-151-16/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the TCP Nagle algorithm to drastically improve the throughput of small packets when creating the TCP socket used to talk with the OpenGLES renderer library. Coupled with a corresponding change in the server part of the code, this improves performance of most applications significantly. + get rid of shouldSetSockOpt field, by performing the buffer adjustment just after the socket is created. Change-Id: Ibacca834ff98d1e9a92fb735f450b925e373fdc0
* | Merge "Fix internet connectivity of emulator over proxy"David Turner2011-08-131-7/+12
|\ \
| * | Fix internet connectivity of emulator over proxyMatthias Thomae2011-08-101-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | When trying to connect to a host on the internet using a proxy, the socket address was passed uninitialized to the proxy manager. The effects were similar to the ones described in Issue 18715. The change adds the socket address to the proxy manager after it has been initialized.
* | | Merge "Fix fron report on unexpected qemud char channel close."Vladimir Chtchetkine2011-08-121-1/+15
|\ \ \
| * | | Fix fron report on unexpected qemud char channel close.Vladimir Chtchetkine2011-08-121-1/+15
| | | | | | | | | | | | | | | | Change-Id: Ib6a1f3ff7a77ae35d6b3b264752f9f62122e60fc
* | | | Merge "Disable trace."Vladimir Chtchetkine2011-08-121-1/+1
|\ \ \ \ | |/ / /
| * | | Disable trace.Vladimir Chtchetkine2011-08-121-1/+1
| |/ / | | | | | | | | | Change-Id: I7130b7f82dec493fb893acf2527755398104cde3
* | | merge from tools_r13The Android Open-Source Project2011-08-119-73/+62
|\ \ \ | | |/ | |/| | | | Change-Id: Iabd0b49a5c3ad991da1b4f636ecdf881b1c271aa
| * | Merge "Revert "Merge c80340 from master to r13: Move charmap to hardware ↵Xavier Ducrohet2011-08-119-73/+62
| |\ \ | | | | | | | | | | | | properties". do not merge." into tools_r13
| | * | Revert "Merge c80340 from master to r13: Move charmap to hardware ↵Xavier Ducrohet2011-08-119-73/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties". do not merge. This reverts commit f490aee025b3bab5bcdb065e5fc1b1abecf16b97. Change-Id: I59a0b2aebc8ab2b788a820a206c6eb4fc6e6e6d2
* | | | merge from tools_r13The Android Open-Source Project2011-08-110-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Change-Id: I61f880174a4aaedf65dafa94e6cc80666612327e
| * | Merge "Merge c80340 from master to r13: Move charmap to hardware properties" ↵Xavier Ducrohet2011-08-119-62/+73
| |\ \ | | |/ | | | | | | into tools_r13
| | * Merge c80340 from master to r13: Move charmap to hardware propertiesDavid 'Digit' Turner2011-08-059-62/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name of the emulated charmap must be passed to the guest kernel because it is used by the guest input handling code to load the proper charmap files from the system partition. This mandates that the name becomes a hardware property for the sake of supporting proper snapshotting and ui/core separation. From now on, the charmap name found in a skin will be ignored completely. This shouldn't be a problem in practice because all skins used the default name (qwerty2) anyway. The only reason to change the default value would be if emulating a guest system image that depends on a different charmap during emulation. Change-Id: If571684000b159ae9e9849661c9ff18e19b4cc75
| * | Merge "merge 62ffc42 from master to r13: Added GTV related keys" into tools_r13Xavier Ducrohet2011-08-115-14/+84
| |\ \ | | |/
| | * merge 62ffc42 from master to r13: Added GTV related keysMaciek Molerus2011-08-055-14/+84
| |/ | | | | | | | | | | | | | | Adds the definitions for keys present in GoogleTV. Standard linux definitions are used to send notifications to emulated system. Change-Id: Iafb84b68a270b6566361d1822b8e1098ee870280
* | Merge "Fic minor bug, and update docs."Vladimir Chtchetkine2011-08-082-6/+17
|\ \
| * | Fic minor bug, and update docs.Vladimir Chtchetkine2011-08-082-6/+17
| | | | | | | | | | | | Change-Id: Ifdc2b019c499d995c8dc493dd4684dd21d0cf995
* | | merge from tools_r13The Android Open-Source Project2011-08-050-0/+0
|\ \ \ | |/ / |/| / | |/ Change-Id: I7c711fd15ad6bb0c1caff88ccacf984b9ee64b96
| * Merge "Fix Windows space-in-path handling for 'emulator'." into tools_r13David Turner2011-08-051-2/+46
| |\
| | * Fix Windows space-in-path handling for 'emulator'.David Turner2011-08-041-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a back-port from master to tools_r13 This modifies the 'emulator' launcher program to work correctly on Windows when it is installed in a path that contains spaces. The program computed the path of the program to be launched correctly, but it turns out that the problem is in the implementation of execv() in either mingw or MSVCRT.DLL: experimentation shows that one needs to quote argv[0] when it contains spaces. However, you must *not* quote the first argument to execv(), otherwise the call will fail. Change-Id: Icf66426c88424f2f5d6274a25fc8530ca489f908 Orig-Change-Id: If291c5a8bd507f96b40634ecbc946ba38346ee4e
* | | Merge "Enable QEMUD over pipe."Vladimir Chtchetkine2011-08-051-42/+432
|\ \ \
| * | | Enable QEMUD over pipe.Vladimir Chtchetkine2011-08-041-42/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to the currently implemented QEMUD over serial port, this CL adds capability to connect with guest clients via pipe device. The connection is established in request from the guest, that opens a "qemud:service-name" on /dev/qemu-pipe, which in turn invikes a callback in the emulator requesting to create a client for a service "service-name". Note that serial port version of QEMUD is fully preserved here. Change-Id: I6621f141cf9b4eb93bfa7cb1a689d80154922c87
* | | | merge from tools_r13The Android Open-Source Project2011-08-050-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: Ia71bb88cacb09eccdc6281897bcc324487a23b01
| * | Merge "Fix window scaling issue." into tools_r13David 'Digit' Turner2011-08-051-6/+10
| |\ \ | | |/
| | * Fix window scaling issue.David 'Digit' Turner2011-08-041-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a back-port from master to tools_r13 This patch fixes a bug in the MMX scaling code. The MMX state was not properly empties when we started the scaling functions. The end result was that, if the hardware FPU was in a certain state, rendering would be be erratic. Fixes http://code.google.com/p/android/issues/detail?id=18299 This bug was hard to reproduce, but the fact that it never happens when building a debug version (with -O0) of the emulator indicated a problem in the generated instruction stream. Glad this isn't a compiler error though :) Change-Id: I19d3b35215120b41d92c85473e419b624ffa0f5f Orig-Change-Id: Icea04a7152b8fa5d81cb70cc215c0cd95aed2142
| * | Merge "Fix -sysdir handling." into tools_r13David 'Digit' Turner2011-08-053-2/+14
| |\ \ | | |/
| | * Fix -sysdir handling.David 'Digit' Turner2011-08-043-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a back-port from master to tools_r13 This patch fixes the processing of the -sysdir option. Previously, using -sysdir <path> would imply that the -system <path>/<path>/system.img is used, which is incorrect. Also fixes the skin search for the case where we are using the emulator without a pre-existing AVD outside of platform builds (e.g. when running tests). This happens with stuff like: emulator -sysdir /path/to/known/sdk/platforms/<name>/images The patch ensures that the /path/to/known/sdk/platforms/<name>/skins directory is probed (this was the behaviour of the Tools R11 emulator). Change-Id: Ibf7ad97de8e1da375f1049600807e0b3d30bfaaa Orig-Change-Id: I32398bec0d7a28ead234f63c847d3ec95ed14b63 Orig-Change-Id: Id77ea9bdc55bb99c1bfbd2ade291ec41f31ec65d
| * | Merge "Auto-adjust scale and window position when needed." into tools_r13David 'Digit' Turner2011-08-053-10/+59
| |\ \ | | |/
| | * Auto-adjust scale and window position when needed.David 'Digit' Turner2011-08-043-10/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport from master to tools_r13 This patch changes the emulator's default behaviour in two ways: - Automatically compute the window scale to ensure that the emulator's window can be displayed within the current screen. This ensures that it remains usable when emulating a large-resolution device on a small display (e.g. on a 13" laptop running at 1024x768). This check and auto-correction do not happen if you use the -scale or -dpi-monitor options. - When re-centering an out-of-focus window, ensure that the top of the window is visible (which generally includes the window's title bar). This allows the window to be easily moved or minimized by the user is needed. This fixes three bugs: http://code.google.com/p/android/issues/detail?id=16399 http://code.google.com/p/android/issues/detail?id=16398 http://code.google.com/p/android/issues/detail?id=16397 Change-Id: Ibbc3c8458bd99718e4902d0a032b154c7cff4757 Orig-Change-Id: I8e5a624446d064038b5b9ad16556db8328244906
| * | Merge "Fixes dataPartition size problem" into tools_r13David Turner2011-08-051-1/+4
| |\ \ | | |/
| | * Fixes dataPartition size problemMaciek Molerus2011-08-041-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | This is a back-port from master to tools_r13 Fixes the problem when disk.systemPartition.size avd setting gets overrided by default 66 MBytes hardcoded in qEmu. Change-Id: Ie15a820c60f48320ee8ca2ea60e4dcb65b762cf9 Orig-Change-Id: Ideb7ca172cb72076c83037f823b86ede2442d6f9
* | Merge "Fix Windows space-in-path handling for 'emulator'."David Turner2011-07-161-2/+46
|\ \
| * | Fix Windows space-in-path handling for 'emulator'.David Turner2011-07-151-2/+46
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the 'emulator' launcher program to work correctly on Windows when it is installed in a path that contains spaces. The program computed the path of the program to be launched correctly, but it turns out that the problem is in the implementation of execv() in either mingw or MSVCRT.DLL: experimentation shows that one needs to quote argv[0] when it contains spaces. However, you must *not* quote the first argument to execv(), otherwise the call will fail. Change-Id: If291c5a8bd507f96b40634ecbc946ba38346ee4e
* | Merge "Added GTV related keys"David Turner2011-07-145-14/+84
|\ \
| * | Added GTV related keysMaciek Molerus2011-07-125-14/+84
|/ / | | | | | | | | | | | | | | Adds the definitions for keys present in GoogleTV. Standard linux definitions are used to send notifications to emulated system. Change-Id: Id87aebfc86c5ce8b7331314352f2640a00ef36ae
* | Merge "opengles qemu-pipe perforance on windows"David Turner2011-07-111-2/+20
|\ \
| * | opengles qemu-pipe perforance on windowsGuy Zadickario2011-07-081-2/+20
|/ / | | | | | | | | | | | | | | | | | | Set the socket send buffer size to 128k on windows to allow higher throuput when sending large blocks over the pipe. On Linux the default value is already 128k. Might want to enable this for all 'tcp" pipes, currently it is only for the opengles pipe. Change-Id: I0c6868b6af54b4df1a0257bfe591baab6f76e14a
* | Merge "Fix window scaling issue."David 'Digit' Turner2011-07-081-6/+10
|\ \
| * | Fix window scaling issue.David 'Digit' Turner2011-07-081-6/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug in the MMX scaling code. The MMX state was not properly empties when we started the scaling functions. The end result was that, if the hardware FPU was in a certain state, rendering would be be erratic. Fixes http://code.google.com/p/android/issues/detail?id=18299 This bug was hard to reproduce, but the fact that it never happens when building a debug version (with -O0) of the emulator indicated a problem in the generated instruction stream. Glad this isn't a compiler error though :) Change-Id: Icea04a7152b8fa5d81cb70cc215c0cd95aed2142
* | Merge "Add new emulator application icons by Roman Nurik"Tor Norbye2011-07-074-0/+0
|\ \
| * | Add new emulator application icons by Roman NurikTor Norbye2011-07-064-0/+0
| | | | | | | | | | | | Change-Id: Ibed33cc30fda31cfc1f823e0ec67c882fa2d9a58
* | | Merge "Fix a small bug in the -sysdir handling."David 'Digit' Turner2011-07-071-1/+1
|\ \ \
| * | | Fix a small bug in the -sysdir handling.David 'Digit' Turner2011-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that auto-configuration would set the value of -system to point to the full path of the system image (e.g. <sysdir>/system.img). Later, the emulator would try to load the <sysdir>/<sysdir>/system.img due to this. Change-Id: Id77ea9bdc55bb99c1bfbd2ade291ec41f31ec65d
generated by cgit v1.1 at 2025-01-25 03:49:47 +0000