diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-09-20 09:58:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-20 09:58:45 -0700 |
| commit | 5380b780bb4f0839cd42ffe64cfb3b73857b6152 (patch) | |
| tree | a92630903c6ffe61b56b809573391e1503aa5f1a /wifi | |
| parent | de4232f721edecd5a9e1fd1d9f11ef53fba7a19a (diff) | |
| parent | 2e9a426529c54774b23609bee8d50118118ab895 (diff) | |
| download | frameworks_base-5380b780bb4f0839cd42ffe64cfb3b73857b6152.zip frameworks_base-5380b780bb4f0839cd42ffe64cfb3b73857b6152.tar.gz frameworks_base-5380b780bb4f0839cd42ffe64cfb3b73857b6152.tar.bz2 | |
am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev
* commit '2e9a426529c54774b23609bee8d50118118ab895':
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 { |