Merge lp:~thomas-voss/platform-api/fix-1335102 into lp:platform-api

[Thomas Voß]

Do not acquire wake locks for gps provider but rely on higher levels of the stack to do the right thing.

Do not acquire wake locks for gps provider but rely on higher levels of the stack to do the right thing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/platform-api-ci/394/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/394/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

Unmerged revisions

284. By Thomas Voß on 2014-11-14

Do not acquire wake locks for gps provider but rely on higher levels of the stack to do the right thing.

=== modified file 'android/hybris/ubuntu_application_gps_for_hybris.cpp'
--- android/hybris/ubuntu_application_gps_for_hybris.cpp	2014-05-13 10:00:55 +0000
+++ android/hybris/ubuntu_application_gps_for_hybris.cpp	2014-11-14 13:05:25 +0000
@@ -23,8 +23,6 @@
 #include <hardware/gps.h>
 #include <hardware_legacy/power.h>
 
-#define WAKE_LOCK_NAME  "U_HARDWARE_GPS"
-
 struct UHardwareGps_
 {
     UHardwareGps_(UHardwareGpsParams* params);
@@ -126,12 +124,14 @@
 
 static void acquire_wakelock_callback()
 {
-    acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME);
+    // Empty on purpose. We install the callback
+    // to make all HAL implementations happy.
 }
 
 static void release_wakelock_callback()
 {
-    release_wake_lock(WAKE_LOCK_NAME);
+    // Empty on purpose. We install the callback
+    // to make all HAL implementations happy.
 }
 
 static void request_utc_time_callback()