summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner <nobody@android.com>2009-06-02 12:30:48 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-02 12:30:48 -0700
commitc69847d6e5b418ef8e77893de73925aac5c64b5f (patch)
tree94a63384ca6dc99b569031dd364cdcf5cd253db7
parente18b7b21c2fe0788e6cf1a1a055a25c2e5bc2dd8 (diff)
downloadlibhardware_legacy-c69847d6e5b418ef8e77893de73925aac5c64b5f.tar.gz
AI 149496: Backport emulator-related donut fixes into cupcake.android-sdk-1.5_r3cupcake
This includes the following fixes: - remove potential qemud crash at system boot - fix GPS fix emulation - fix inter-emulator networking (DNS resolution helper now behaves correctly on all IPv6-capable systems) - add -prop <name>=<value> option to add system properties on boot - allow F5 keybinding for SEARCH on keyboard-less hardware configurations - allow skins to provide a "search" button - fixed bad QADD/QSUB/QDADD/QDSUB ARM CPU instructions emulation Automated import of CL 149496
-rw-r--r--gps/gps_qemu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/gps/gps_qemu.c b/gps/gps_qemu.c
index d55fb22..aa919a0 100644
--- a/gps/gps_qemu.c
+++ b/gps/gps_qemu.c
@@ -752,7 +752,7 @@ gps_state_init( GpsState* state )
return;
}
- D("gps emulation will read from %s", device);
+ D("gps emulation will read from '%s' qemud channel", QEMU_CHANNEL_NAME );
if ( socketpair( AF_LOCAL, SOCK_STREAM, 0, state->control ) < 0 ) {
LOGE("could not create thread control socket pair: %s", strerror(errno));
@@ -867,9 +867,6 @@ qemu_gps_delete_aiding_data(GpsAidingData flags)
static int qemu_gps_set_position_mode(GpsPositionMode mode, int fix_frequency)
{
// FIXME - support fix_frequency
- // only standalone supported for now.
- if (mode != GPS_POSITION_MODE_STANDALONE)
- return -1;
return 0;
}