diff options
author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:47:18 -0800 |
commit | a546c7006355a7bd1df4267ee53d0bfa2c017c8c (patch) | |
tree | 01be0bf6c0d6968e1468ec9661fd52110f9b05a7 /android/hw-sensors.c | |
parent | baf3d7830396202df5cc47bd7bcee109c319cdb3 (diff) | |
parent | 0f809250987b64f491bd3b4b73c0f0d33036a786 (diff) | |
download | external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.zip external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.gz external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.bz2 |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Diffstat (limited to 'android/hw-sensors.c')
-rw-r--r-- | android/hw-sensors.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/android/hw-sensors.c b/android/hw-sensors.c index 17b2491..a7daea5 100644 --- a/android/hw-sensors.c +++ b/android/hw-sensors.c @@ -438,7 +438,7 @@ _hwSensorClient_receive( HwSensorClient* cl, uint8_t* msg, int msglen ) } /* If emulating device is connected update sensor state there too. */ - if (hw->sensors_port != NULL && sensors_port_is_connected(hw->sensors_port)) { + if (hw->sensors_port != NULL) { if (enabled) { sensors_port_enable_sensor(hw->sensors_port, (const char*)msg); } else { @@ -692,11 +692,6 @@ _hwSensors_init( HwSensors* h ) h->sensors[ANDROID_SENSOR_TEMPERATURE].enabled = 1; } - if (h->sensors_port != NULL) { - /* Init sensors on the attached device. */ - sensors_port_init_sensors(h->sensors_port); - } - /* XXX: TODO: Add other tests when we add the corresponding * properties to hardware-properties.ini et al. */ |