dont keep bad link score due to txerrors for too long

Change-Id: I181eabc72ca93d29470d46017e9f34df2e71093e
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index caf90fe..ee9a8dd 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4218,7 +4218,7 @@
             sb.append(String.format(" ls+=%d", mWifiInfo.linkStuckCount));
             if (PDBG) loge(" bad link -> stuck count ="
                     + Integer.toString(mWifiInfo.linkStuckCount));
-        } else if (mWifiInfo.txSuccessRate > 2 || mWifiInfo.txBadRate < 0.1) {
+        } else if (mWifiInfo.txBadRate < 0.3) {
             if (mWifiInfo.linkStuckCount > 0)
                 mWifiInfo.linkStuckCount -= 1;
             sb.append(String.format(" ls-=%d", mWifiInfo.linkStuckCount));
@@ -8076,6 +8076,7 @@
                     }
                     break;
                 case CMD_ENABLE_RSSI_POLL:
+                    cleanWifiScore();
                     if (mWifiConfigStore.enableRssiPollWhenAssociated.get()) {
                         mEnableRssiPolling = (message.arg1 == 1);
                     } else {
@@ -8087,8 +8088,6 @@
                         fetchRssiLinkSpeedAndFrequencyNative();
                         sendMessageDelayed(obtainMessage(CMD_RSSI_POLL,
                                 mRssiPollToken, 0), POLL_RSSI_INTERVAL_MSECS);
-                    } else {
-                        cleanWifiScore();
                     }
                     break;
                 case WifiManager.RSSI_PKTCNT_FETCH: