diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-11-29 18:37:04 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-11-29 18:37:04 -0800 |
| commit | ddba10622dfd3122cf99c795706754e0d41858c3 (patch) | |
| tree | eaec502af61986a4ecd8349ffd647466ed9543e1 /wifi | |
| parent | b468a8fd2b6fba095372afef9272024c9385688d (diff) | |
| download | frameworks_base-ddba10622dfd3122cf99c795706754e0d41858c3.zip frameworks_base-ddba10622dfd3122cf99c795706754e0d41858c3.tar.gz frameworks_base-ddba10622dfd3122cf99c795706754e0d41858c3.tar.bz2 | |
Clean up InterfaceConfiguration flags.
Offer modifier methods for interface flags instead of mutating
directly, and remove square brackets.
Change-Id: I4cce719dccedfb3f0e8448c111e65b93c0008cbb
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 14 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 3ed9bd5..253e0ec 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1153,9 +1153,9 @@ public class WifiStateMachine extends StateMachine { ifcg = mNwService.getInterfaceConfig(intf); if (ifcg != null) { /* IP/netmask: 192.168.43.1/255.255.255.0 */ - ifcg.addr = new LinkAddress(NetworkUtils.numericToInetAddress( - "192.168.43.1"), 24); - ifcg.interfaceFlags = "[up]"; + ifcg.setLinkAddress(new LinkAddress( + NetworkUtils.numericToInetAddress("192.168.43.1"), 24)); + ifcg.setInterfaceUp(); mNwService.setInterfaceConfig(intf, ifcg); } @@ -1187,8 +1187,8 @@ public class WifiStateMachine extends StateMachine { try { ifcg = mNwService.getInterfaceConfig(mInterfaceName); if (ifcg != null) { - ifcg.addr = new LinkAddress(NetworkUtils.numericToInetAddress( - "0.0.0.0"), 0); + ifcg.setLinkAddress( + new LinkAddress(NetworkUtils.numericToInetAddress("0.0.0.0"), 0)); mNwService.setInterfaceConfig(mInterfaceName, ifcg); } } catch (Exception e) { @@ -2911,8 +2911,8 @@ public class WifiStateMachine extends StateMachine { DhcpInfoInternal dhcpInfoInternal = WifiConfigStore.getIpConfiguration( mLastNetworkId); InterfaceConfiguration ifcg = new InterfaceConfiguration(); - ifcg.addr = dhcpInfoInternal.makeLinkAddress(); - ifcg.interfaceFlags = "[up]"; + ifcg.setLinkAddress(dhcpInfoInternal.makeLinkAddress()); + ifcg.setInterfaceUp(); try { mNwService.setInterfaceConfig(mInterfaceName, ifcg); if (DBG) log("Static IP configuration succeeded"); diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index f7e79b3..ceca78d 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -1230,9 +1230,9 @@ public class WifiP2pService extends IWifiP2pManager.Stub { InterfaceConfiguration ifcg = null; try { ifcg = mNwService.getInterfaceConfig(intf); - ifcg.addr = new LinkAddress(NetworkUtils.numericToInetAddress( - SERVER_ADDRESS), 24); - ifcg.interfaceFlags = "[up]"; + ifcg.setLinkAddress(new LinkAddress(NetworkUtils.numericToInetAddress( + SERVER_ADDRESS), 24)); + ifcg.setInterfaceUp(); mNwService.setInterfaceConfig(intf, ifcg); /* This starts the dnsmasq server */ mNwService.startTethering(DHCP_RANGE); |