am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev

* commit '2ce3362385589df472aa8e221d01ca7d8118508d':
  Remove STOPSHIP in WifiWatchdogStateMachine
This commit is contained in:
Yuhao Zheng
2013-09-19 14:14:14 -07:00
committed by Android Git Automerger

View File

@@ -75,8 +75,7 @@ import java.text.DecimalFormat;
*/
public class WifiWatchdogStateMachine extends StateMachine {
/* STOPSHIP: Keep this configurable for debugging until ship */
private static boolean DBG = false;
private static final boolean DBG = false;
private static final int BASE = Protocol.BASE_WIFI_WATCHDOG;
@@ -697,10 +696,6 @@ public class WifiWatchdogStateMachine extends StateMachine {
switch (msg.what) {
case EVENT_WATCHDOG_SETTINGS_CHANGE:
updateSettings();
// STOPSHIP: Remove this at ship
logd("Updated secure settings and turned debug on");
DBG = true;
if (mPoorNetworkDetectionEnabled) {
transitionTo(mOnlineWatchState);
} else {