commit 56199cc25e7ee0455ec2a8099098b66b8554f677
author Andrei Popescu <andreip@google.com> Tue Jan 12 22:39:16 2010 +0000
committer Andrei Popescu <andreip@google.com> Fri Jan 15 20:03:29 2010 +0000
tree edc5e608d3e8d21173cd758cf26ed040dda7052d
parent 1e5bad97ca8fb9b12501f4f747941d02f03e1362

Detect if the current network is wifi or not and update webkit.
This info is passed to youtube.com via a custom HTTP header.

Fixes b:2368650

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 9b6fb71..a458087 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -44,6 +44,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.WebAddress;
 import android.net.http.SslCertificate;
@@ -296,6 +297,14 @@
                             ConnectivityManager.CONNECTIVITY_ACTION)) {
                         boolean noConnectivity = intent.getBooleanExtra(
                                 ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
+                        if (!noConnectivity) {
+                            NetworkInfo info = intent.getParcelableExtra(
+                                    ConnectivityManager.EXTRA_NETWORK_INFO);
+                            String typeName = info.getTypeName();
+                            String subtypeName = info.getSubtypeName();
+                            sendNetworkType(typeName.toLowerCase(),
+                                    (subtypeName != null ? subtypeName.toLowerCase() : ""));
+                        }
                         onNetworkToggle(!noConnectivity);
                     }
                 }
@@ -3620,6 +3629,14 @@
         getWindow().setFlags(flag, WindowManager.LayoutParams.FLAG_FULLSCREEN);
     }
 
+
+    private void sendNetworkType(String type, String subtype) {
+        WebView w = mTabControl.getCurrentWebView();
+        if (w != null) {
+            w.setNetworkType(type, subtype);
+        }
+    }
+
     final static int LOCK_ICON_UNSECURE = 0;
     final static int LOCK_ICON_SECURE   = 1;
     final static int LOCK_ICON_MIXED    = 2;