Merge "Reset notification state on wifi enable" into froyo

2010-04-19 09:50:37 -07:00
parent 04152f98ff 2d1a6e9429
commit 1892013643
1 changed files with 2 additions and 0 deletions
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@ -735,6 +735,8 @@ public class WifiStateTracker extends NetworkStateTracker {
                mRunState = RUN_STATE_RUNNING;
                noteRunState();
                checkUseStaticIp();
+                /* Reset notification state on new connection */
+                resetNotificationTimer();
                /*
                 * DHCP requests are blocking, so run them in a separate thread.
                 */