commit bfb7bfa53847832db2a3eb05e5eff7cb974c3c7a
author Robert Greenwalt <robdroid@android.com> Wed Mar 24 16:03:21 2010 -0700
committer Robert Greenwalt <robdroid@android.com> Thu Mar 25 14:46:13 2010 -0700
tree 6f7b9f635d9b1d47caca0a5c7f2b338bc536b4f8
parent 838bfef91504837b64c4f11be820aa2aa4cd4efe

Update Framework to support multiple dhpc ranges

Previously we only supported a single range - this was inadequate for
multiple interfaces.  Adding a second range so we can support
both usb and wifi tethering.

Also moving out of the zero-conf range as our dhcp client won't
accept ip addrs in that range (no nexus to nexus wifi action).

bug: 2537963
bug: 2533491
bug: 2538303
Change-Id: I600b421343c28c2f9839ed2076122ae3d0ff5d3d

services/java/com/android/server/WifiService.java

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index b41443e..6fe4c98 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -289,8 +289,8 @@
                     try {
                         ifcg = service.getInterfaceConfig(intf);
                         if (ifcg != null) {
-                            /* IP/netmask: 169.254.2.2/255.255.255.0 */
-                            ifcg.ipAddr = (169 << 24) + (254 << 16) + (2 << 8) + 2;
+                            /* IP/netmask: 192.168.43.1/255.255.255.0 */
+                            ifcg.ipAddr = (192 << 24) + (168 << 16) + (43 << 8) + 1;
                             ifcg.netmask = (255 << 24) + (255 << 16) + (255 << 8) + 0;
                             ifcg.interfaceFlags = "up";