summaryrefslogtreecommitdiffstats
path: root/halimpl
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2017-04-11 16:46:52 -0700
committerSteven Moreland <smoreland@google.com>2017-04-12 21:38:41 -0700
commitc634db72adf6652924fd6ce2d574ec7d68a16166 (patch)
tree5b666fc1a0788fdbe83eb6cbe276335edafad1a2 /halimpl
parent92b8c4fc092fd0b25450c414d118cf6f73d4e11e (diff)
downloadandroid_hardware_broadcom_nfc-c634db72adf6652924fd6ce2d574ec7d68a16166.tar.gz
android_hardware_broadcom_nfc-c634db72adf6652924fd6ce2d574ec7d68a16166.tar.bz2
android_hardware_broadcom_nfc-c634db72adf6652924fd6ce2d574ec7d68a16166.zip
Remove dependency on libpower.
NFC HALs shouldn't be grabbing wakelocks; the framework process grabs a wakelock when we need to (basically, when transition from SCREEN_ON to SCREEN_OFF and vice-versa). Test: builds Change-Id: I1fa021c4d06dacdc37391a53ed76736b5822f8c6 Merged-In: I1fa021c4d06dacdc37391a53ed76736b5822f8c6
Diffstat (limited to 'halimpl')
-rw-r--r--halimpl/bcm2079x/gki/ulinux/gki_ulinux.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
index 5c6098f..255d7c2 100644
--- a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
+++ b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
@@ -365,7 +365,6 @@ void GKI_shutdown(void) {
#endif
if (gki_cb.os.gki_timer_wake_lock_on) {
GKI_TRACE_0("GKI_shutdown : release_wake_lock(brcm_btld)");
- release_wake_lock(WAKE_LOCK_ID);
gki_cb.os.gki_timer_wake_lock_on = 0;
}
oldCOnd = *p_run_cond;
@@ -402,11 +401,9 @@ void gki_system_tick_start_stop_cback(bool start) {
">>> STOP GKI_timer_update(), wake_lock_count:%d",
--wake_lock_count);
#endif
- release_wake_lock(WAKE_LOCK_ID);
gki_cb.os.gki_timer_wake_lock_on = 0;
} else {
/* restart GKI_timer_update() loop */
- acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_ID);
gki_cb.os.gki_timer_wake_lock_on = 1;
*p_run_cond = GKI_TIMER_TICK_RUN_COND;
pthread_mutex_lock(&p_os->gki_timer_mutex);