Remove the optimization for unarming the timerandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-release

Bug: 22388460
Change-Id: Ib45d9cd36725c7cb9b82540cf395bd21f5d35fd4

1 files changed, 1 insertions, 4 deletions

diff --git a/src/upio.c b/src/upio.c
index 4ffef9a..3f73482 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -446,7 +446,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
                 UPIODBG("BT_WAKE is %s already", lpm_state[action]);
 
 #if (BT_WAKE_VIA_PROC == TRUE)
-                if (lpm_proc_cb.btwrite_active == TRUE) {
+                if (lpm_proc_cb.btwrite_active == TRUE)
                     /*
                      * The proc btwrite node could have not been updated for
                      * certain time already due to heavy downstream path flow.
@@ -456,10 +456,7 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
                      * a 10sec internal in-activity timeout timer before it
                      * attempts to deassert BT_WAKE line.
                      */
-                    /* re-arm user space timer */
-                    upio_start_stop_timer(action);
                     return;
-                }
 #else
                 return;
 #endif