From fffc5a4ec9a4688d6d26260d5a21002d1d9a9956 Mon Sep 17 00:00:00 2001 From: Yuhao Zheng Date: Thu, 19 Sep 2013 14:02:58 -0700 Subject: [PATCH] Remove STOPSHIP in WifiWatchdogStateMachine There used to be some STOPSHIP code in WifiWatchdogStateMachine for debug purposes. We don't need them for the release. Bug: 10841961 Change-Id: I501d62e9891ace52317e6c1d399b877175099a3c --- wifi/java/android/net/wifi/WifiWatchdogStateMachine.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java index eb47a4a1251fa..6278c8921f613 100644 --- a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java +++ b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java @@ -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 {