diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2013-12-02 20:53:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-02 20:53:06 +0000 |
commit | 317d15c15531b353aa3e8cb1a3ba03d98b71efb6 (patch) | |
tree | 11a8c9fa17556233b9ee165dd37ff627e6999e6a /wifi | |
parent | d786a1900e94c4f0c919b50b44667cea32fd2939 (diff) | |
parent | 4806fdfbd0fecf91584396fc0f620c97a05ab837 (diff) | |
download | frameworks_base-317d15c15531b353aa3e8cb1a3ba03d98b71efb6.zip frameworks_base-317d15c15531b353aa3e8cb1a3ba03d98b71efb6.tar.gz frameworks_base-317d15c15531b353aa3e8cb1a3ba03d98b71efb6.tar.bz2 |
am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."
* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
Use LinkAddress in address notifications.
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 0fadff8..49fc75d 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -238,24 +238,24 @@ public class WifiStateMachine extends StateMachine { } @Override - public void addressUpdated(String address, String iface, int flags, int scope) { + public void addressUpdated(LinkAddress address, String iface, int flags, int scope) { if (mWifiStateMachine.mInterfaceName.equals(iface)) { if (DBG) { log("addressUpdated: " + address + " on " + iface + " flags " + flags + " scope " + scope); } - mWifiStateMachine.sendMessage(CMD_IP_ADDRESS_UPDATED, new LinkAddress(address)); + mWifiStateMachine.sendMessage(CMD_IP_ADDRESS_UPDATED, address); } } @Override - public void addressRemoved(String address, String iface, int flags, int scope) { + public void addressRemoved(LinkAddress address, String iface, int flags, int scope) { if (mWifiStateMachine.mInterfaceName.equals(iface)) { if (DBG) { log("addressRemoved: " + address + " on " + iface + " flags " + flags + " scope " + scope); } - mWifiStateMachine.sendMessage(CMD_IP_ADDRESS_REMOVED, new LinkAddress(address)); + mWifiStateMachine.sendMessage(CMD_IP_ADDRESS_REMOVED, address); } } } |