diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-12-09 18:34:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-09 18:34:44 +0000 |
| commit | 4598ea4e5e6b2accce5165a76f5e2d04ce46c74c (patch) | |
| tree | c8750497aed5e07242cd2ce0e4361b2b04a79b39 /services/tests | |
| parent | 3f6239e37e1eff1e42e0a595ffd4d30d1876a9ea (diff) | |
| parent | 263c4788dcf45f104f8668fd6621d1a7c39689b9 (diff) | |
| download | frameworks_base-4598ea4e5e6b2accce5165a76f5e2d04ce46c74c.zip frameworks_base-4598ea4e5e6b2accce5165a76f5e2d04ce46c74c.tar.gz frameworks_base-4598ea4e5e6b2accce5165a76f5e2d04ce46c74c.tar.bz2 | |
am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
* commit '263c4788dcf45f104f8668fd6621d1a7c39689b9':
Add address flags and scope to LinkAddress.
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java index a78e7b6..7a30d31 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java @@ -158,17 +158,14 @@ public class NetworkManagementServiceTest extends AndroidTestCase { * IP address changes. */ sendMessage("614 Address updated fe80::1/64 wlan0 128 253"); - expectSoon(observer).addressUpdated( - new LinkAddress("fe80::1/64"), "wlan0", 128, 253); + expectSoon(observer).addressUpdated("wlan0", new LinkAddress("fe80::1/64", 128, 253)); // There is no "added", so we take this as "removed". sendMessage("614 Address added fe80::1/64 wlan0 128 253"); - expectSoon(observer).addressRemoved( - new LinkAddress("fe80::1/64"), "wlan0", 128, 253); + expectSoon(observer).addressRemoved("wlan0", new LinkAddress("fe80::1/64", 128, 253)); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1 0"); - expectSoon(observer).addressRemoved( - new LinkAddress("2001:db8::1/64"), "wlan0", 1, 0); + expectSoon(observer).addressRemoved("wlan0", new LinkAddress("2001:db8::1/64", 1, 0)); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1"); // Not enough arguments. |