summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2013-11-26 17:56:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-26 17:56:45 -0800
commit4806fdfbd0fecf91584396fc0f620c97a05ab837 (patch)
tree47521e7d98b953f0397c40d3f6791e9b1f73c6e0 /wifi/java/android/net
parent37e4c405a6136f90e5a8d4fc512cf7f551eb0c56 (diff)
parentf226bc606af9ce5aceff6b05fc4b0200c94cb248 (diff)
downloadframeworks_base-4806fdfbd0fecf91584396fc0f620c97a05ab837.zip
frameworks_base-4806fdfbd0fecf91584396fc0f620c97a05ab837.tar.gz
frameworks_base-4806fdfbd0fecf91584396fc0f620c97a05ab837.tar.bz2
am f226bc60: Merge "Use LinkAddress in address notifications."
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248': Use LinkAddress in address notifications.
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java8
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 eedd66f..d8ca6b0 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -242,24 +242,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);
}
}
}