diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-12-07 02:43:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-07 02:43:04 +0000 |
| commit | 2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2 (patch) | |
| tree | 463582fb243cd98893fe7ca1ca75cda2e1ff7d11 /wifi | |
| parent | 6b8a3a52acf1c2722551f1ea1ce47831f87939cd (diff) | |
| parent | 64483947fdb03bf838e317ac0a4af5e0f53a5bbf (diff) | |
| download | frameworks_base-2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2.zip frameworks_base-2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2.tar.gz frameworks_base-2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2.tar.bz2 | |
Merge "Add address flags and scope to LinkAddress."
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index d8ca6b0..69d3efe 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -241,24 +241,25 @@ public class WifiStateMachine extends StateMachine { mWifiStateMachine = wifiStateMachine; } + private void maybeLog(String operation, String iface, LinkAddress address) { + if (DBG) { + log(operation + ": " + address + " on " + iface + + " flags " + address.getFlags() + " scope " + address.getScope()); + } + } + @Override - public void addressUpdated(LinkAddress address, String iface, int flags, int scope) { + public void addressUpdated(String iface, LinkAddress address) { if (mWifiStateMachine.mInterfaceName.equals(iface)) { - if (DBG) { - log("addressUpdated: " + address + " on " + iface + - " flags " + flags + " scope " + scope); - } + maybeLog("addressUpdated", iface, address); mWifiStateMachine.sendMessage(CMD_IP_ADDRESS_UPDATED, address); } } @Override - public void addressRemoved(LinkAddress address, String iface, int flags, int scope) { + public void addressRemoved(String iface, LinkAddress address) { if (mWifiStateMachine.mInterfaceName.equals(iface)) { - if (DBG) { - log("addressRemoved: " + address + " on " + iface + - " flags " + flags + " scope " + scope); - } + maybeLog("addressRemoved", iface, address); mWifiStateMachine.sendMessage(CMD_IP_ADDRESS_REMOVED, address); } } |