diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 16 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java | 14 |
2 files changed, 19 insertions, 11 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index 8089fbc..40ea49e 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -405,7 +405,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub /** * Notify our observers of a new or updated interface address. */ - private void notifyAddressUpdated(String address, String iface, int flags, int scope) { + private void notifyAddressUpdated(LinkAddress address, String iface, int flags, int scope) { final int length = mObservers.beginBroadcast(); for (int i = 0; i < length; i++) { try { @@ -420,7 +420,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub /** * Notify our observers of a deleted interface address. */ - private void notifyAddressRemoved(String address, String iface, int flags, int scope) { + private void notifyAddressRemoved(LinkAddress address, String iface, int flags, int scope) { final int length = mObservers.beginBroadcast(); for (int i = 0; i < length; i++) { try { @@ -537,17 +537,21 @@ public class NetworkManagementService extends INetworkManagementService.Stub int flags; int scope; + LinkAddress address; try { flags = Integer.parseInt(cooked[5]); scope = Integer.parseInt(cooked[6]); - } catch(NumberFormatException e) { - throw new IllegalStateException(errorMessage); + address = new LinkAddress(cooked[3]); + } catch(NumberFormatException e) { // Non-numeric lifetime or scope. + throw new IllegalStateException(errorMessage, e); + } catch(IllegalArgumentException e) { // Malformed IP address. + throw new IllegalStateException(errorMessage, e); } if (cooked[2].equals("updated")) { - notifyAddressUpdated(cooked[3], cooked[4], flags, scope); + notifyAddressUpdated(address, cooked[4], flags, scope); } else { - notifyAddressRemoved(cooked[3], cooked[4], flags, scope); + notifyAddressRemoved(address, cooked[4], flags, scope); } return true; // break; diff --git a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java index 4385dcd..a78e7b6 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java @@ -17,6 +17,7 @@ package com.android.server; import android.content.Context; +import android.net.LinkAddress; import android.net.LocalSocket; import android.net.LocalServerSocket; import android.os.Binder; @@ -157,19 +158,22 @@ public class NetworkManagementServiceTest extends AndroidTestCase { * IP address changes. */ sendMessage("614 Address updated fe80::1/64 wlan0 128 253"); - expectSoon(observer).addressUpdated("fe80::1/64", "wlan0", 128, 253); + expectSoon(observer).addressUpdated( + new LinkAddress("fe80::1/64"), "wlan0", 128, 253); - // There is no "added". + // There is no "added", so we take this as "removed". sendMessage("614 Address added fe80::1/64 wlan0 128 253"); - expectSoon(observer).addressRemoved("fe80::1/64", "wlan0", 128, 253); + expectSoon(observer).addressRemoved( + new LinkAddress("fe80::1/64"), "wlan0", 128, 253); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1 0"); - expectSoon(observer).addressRemoved("2001:db8::1/64", "wlan0", 1, 0); + expectSoon(observer).addressRemoved( + new LinkAddress("2001:db8::1/64"), "wlan0", 1, 0); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1"); // Not enough arguments. - sendMessage("666 Address added 2001:db8::1/64 wlan0 1 0"); + sendMessage("666 Address removed 2001:db8::1/64 wlan0 1 0"); // Invalid code. |