diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/config/check-esd.c | 2 | ||||
| -rw-r--r-- | android/console.c | 6 | ||||
| -rw-r--r-- | android/skin/window.c | 17 | ||||
| -rw-r--r-- | android/ui-core-protocol.c | 3 |
4 files changed, 17 insertions, 11 deletions
diff --git a/android/config/check-esd.c b/android/config/check-esd.c index a8eb11b..684afe2 100644 --- a/android/config/check-esd.c +++ b/android/config/check-esd.c @@ -47,7 +47,7 @@ int main( void ) esd_lib = dlopen( "libesd.so.0", RTLD_NOW ); if (esd_lib == NULL) { - D("could not find libesd on this system"); + D("could not find libesd on this system\n"); return 1; } diff --git a/android/console.c b/android/console.c index c47768e..3db9b30 100644 --- a/android/console.c +++ b/android/console.c @@ -545,7 +545,7 @@ control_global_accept( void* _global ) ControlClient client; Socket fd; - D(( "control_global_accept: just in (fd=%p)\n", (void*)global->listen_fd )); + D(( "control_global_accept: just in (fd=%d)\n", global->listen_fd )); for(;;) { fd = socket_accept( global->listen_fd, NULL ); @@ -1047,6 +1047,7 @@ do_cdma_prl_version( ControlClient client, char * args ) if (endptr != args) { amodem_set_cdma_prl_version( android_modem, version ); } + return 0; } /********************************************************************************************/ /********************************************************************************************/ @@ -1398,6 +1399,9 @@ static const CommandDefRec cdma_commands[] = { "ssource", "Set the current CDMA subscription source", NULL, describe_subscription_source, do_cdma_ssource, NULL }, + { "prl_version", "Dump the current PRL version", + NULL, NULL, + do_cdma_prl_version, NULL }, }; static const CommandDefRec gsm_commands[] = diff --git a/android/skin/window.c b/android/skin/window.c index b1d98af..edc9028 100644 --- a/android/skin/window.c +++ b/android/skin/window.c @@ -1220,6 +1220,15 @@ skin_window_reset_internal ( SkinWindow* window, SkinLayout* slayout ) skin_window_redraw( window, NULL ); + if (slayout->event_type != 0) { + user_event_generic( slayout->event_type, slayout->event_code, slayout->event_value ); + /* XXX: hack, replace by better code here */ + if (slayout->event_value != 0) + android_core_sensors_set_coarse_orientation( ANDROID_COARSE_PORTRAIT ); + else + android_core_sensors_set_coarse_orientation( ANDROID_COARSE_LANDSCAPE ); + } + return 0; } @@ -1232,14 +1241,6 @@ skin_window_reset ( SkinWindow* window, SkinLayout* slayout ) if (skin_window_reset_internal( window, slayout ) < 0) return -1; - if (slayout->event_type != 0) { - user_event_generic( slayout->event_type, slayout->event_code, slayout->event_value ); - /* XXX: hack, replace by better code here */ - if (slayout->event_value != 0) - android_core_sensors_set_coarse_orientation( ANDROID_COARSE_PORTRAIT ); - else - android_core_sensors_set_coarse_orientation( ANDROID_COARSE_LANDSCAPE ); - } return 0; } diff --git a/android/ui-core-protocol.c b/android/ui-core-protocol.c index 4da625c..8877c0b 100644 --- a/android/ui-core-protocol.c +++ b/android/ui-core-protocol.c @@ -28,10 +28,11 @@ #include "trace.h" #include "audio/audio.h" /* Implemented in vl-android.c */ -extern void qemu_system_shutdown_request(void); extern char* qemu_find_file(int type, const char* filename); #endif // CONFIG_STANDALONE_UI +extern void qemu_system_shutdown_request(void); + int android_core_get_hw_lcd_density(void) { |