Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / android / java / src / org / chromium / net / NetworkChangeNotifierAutoDetect.java

diff --git a/src/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/src/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
index 981e3dc..1e72da9 100644 (file)
--- a/src/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
+++ b/src/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
@@ -14,7 +14,8 @@ import android.net.wifi.WifiManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import org.chromium.base.ActivityStatus;
+import org.chromium.base.ApplicationState;
+import org.chromium.base.ApplicationStatus;
 
 /**
  * Used by the NetworkChangeNotifier to listens to platform changes in connectivity.
@@ -22,7 +23,7 @@ import org.chromium.base.ActivityStatus;
  * ACCESS_NETWORK_STATE permission.
  */
 public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
-        implements ActivityStatus.StateListener {
+        implements ApplicationStatus.ApplicationStateListener {
 
     /** Queries the ConnectivityManager for information about the current connection. */
     static class ConnectivityManagerDelegate {
@@ -100,14 +101,24 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
         public void onConnectionTypeChanged(int newConnectionType);
     }
 
-    public NetworkChangeNotifierAutoDetect(Observer observer, Context context) {
+    /**
+     * Constructs a NetworkChangeNotifierAutoDetect.
+     * @param alwaysWatchForChanges If true, always watch for network changes.
+     *    Otherwise, only watch if app is in foreground.
+     */
+    public NetworkChangeNotifierAutoDetect(Observer observer, Context context,
+            boolean alwaysWatchForChanges) {
         mObserver = observer;
         mContext = context.getApplicationContext();
         mConnectivityManagerDelegate = new ConnectivityManagerDelegate(context);
         mWifiManagerDelegate = new WifiManagerDelegate(context);
         mConnectionType = getCurrentConnectionType();
         mWifiSSID = getCurrentWifiSSID();
-        ActivityStatus.registerStateListener(this);
+        if (alwaysWatchForChanges) {
+            registerReceiver();
+        } else {
+            ApplicationStatus.registerApplicationStateListener(this);
+        }
     }
 
     /**
@@ -162,6 +173,8 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
                 return NetworkChangeNotifier.CONNECTION_WIFI;
             case ConnectivityManager.TYPE_WIMAX:
                 return NetworkChangeNotifier.CONNECTION_4G;
+            case ConnectivityManager.TYPE_BLUETOOTH:
+                return NetworkChangeNotifier.CONNECTION_BLUETOOTH;
             case ConnectivityManager.TYPE_MOBILE:
                 // Use information from TelephonyManager to classify the connection.
                 switch (mConnectivityManagerDelegate.getNetworkSubtype()) {
@@ -203,19 +216,13 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
         connectionTypeChanged();
     }
 
-    // ActivityStatus.StateListener
+    // ApplicationStatus.ApplicationStateListener
     @Override
-    public void onActivityStateChange(int state) {
-        if (state == ActivityStatus.RESUMED) {
-            // Note that this also covers the case where the main activity is created. The CREATED
-            // event is always followed by the RESUMED event. This is a temporary "hack" until
-            // http://crbug.com/176837 is fixed. The CREATED event can't be used reliably for now
-            // since its notification is deferred. This means that it can immediately follow a
-            // DESTROYED/STOPPED/... event which is problematic.
-            // TODO(pliard): fix http://crbug.com/176837.
+    public void onApplicationStateChange(int newState) {
+        if (newState == ApplicationState.HAS_RUNNING_ACTIVITIES) {
             connectionTypeChanged();
             registerReceiver();
-        } else if (state == ActivityStatus.PAUSED) {
+        } else if (newState == ApplicationState.HAS_PAUSED_ACTIVITIES) {
             unregisterReceiver();
         }
     }