diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-09-19 14:14:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-19 14:14:14 -0700 |
| commit | 2e9a426529c54774b23609bee8d50118118ab895 (patch) | |
| tree | d93cfc411c35327d5f65f79e6c71846ac9fceb93 /wifi | |
| parent | 9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd (diff) | |
| parent | 2ce3362385589df472aa8e221d01ca7d8118508d (diff) | |
| download | frameworks_base-2e9a426529c54774b23609bee8d50118118ab895.zip frameworks_base-2e9a426529c54774b23609bee8d50118118ab895.tar.gz frameworks_base-2e9a426529c54774b23609bee8d50118118ab895.tar.bz2 | |
am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev
* commit '2ce3362385589df472aa8e221d01ca7d8118508d':
Remove STOPSHIP in WifiWatchdogStateMachine
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiWatchdogStateMachine.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java index eb47a4a..6278c89 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 { |