Merge "Add USB RNDIS enable/disable control"

2010-02-23 18:08:04 -08:00
parent 2e1818a4d1 65ae29bd85
commit 5cde63a60d
4 changed files with 238 additions and 32 deletions
--- a/core/java/android/net/InterfaceConfiguration.java
+++ b/core/java/android/net/InterfaceConfiguration.java
@@ -45,10 +45,10 @@ public class InterfaceConfiguration implements Parcelable {
    }

    private static void putAddress(StringBuffer buf, int addr) {
-        buf.append(addr  & 0xff).append('.').
-            append((addr >>>= 8) & 0xff).append('.').
-            append((addr >>>= 8) & 0xff).append('.').
-            append((addr >>>= 8) & 0xff);
+        buf.append((addr >> 24) & 0xff).append('.').
+            append((addr >> 16) & 0xff).append('.').
+            append((addr >> 8) & 0xff).append('.').
+            append(addr & 0xff);
    }

    /** Implement the Parcelable interface {@hide} */