summaryrefslogtreecommitdiff
path: root/core/java/android
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 /core/java/android
parent37e4c405a6136f90e5a8d4fc512cf7f551eb0c56 (diff)
parentf226bc606af9ce5aceff6b05fc4b0200c94cb248 (diff)
am f226bc60: Merge "Use LinkAddress in address notifications."
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248': Use LinkAddress in address notifications.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/INetworkManagementEventObserver.aidl6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/INetworkManagementEventObserver.aidl b/core/java/android/net/INetworkManagementEventObserver.aidl
index c720c7b1da79..405a897a9004 100644
--- a/core/java/android/net/INetworkManagementEventObserver.aidl
+++ b/core/java/android/net/INetworkManagementEventObserver.aidl
@@ -16,6 +16,8 @@
package android.net;
+import android.net.LinkAddress;
+
/**
* Callback class for receiving events from an INetworkManagementService
*
@@ -62,7 +64,7 @@ interface INetworkManagementEventObserver {
* @param flags The address flags.
* @param scope The address scope.
*/
- void addressUpdated(String address, String iface, int flags, int scope);
+ void addressUpdated(in LinkAddress address, String iface, int flags, int scope);
/**
* An interface address has been removed
@@ -72,7 +74,7 @@ interface INetworkManagementEventObserver {
* @param flags The address flags.
* @param scope The address scope.
*/
- void addressRemoved(String address, String iface, int flags, int scope);
+ void addressRemoved(in LinkAddress address, String iface, int flags, int scope);
/**
* A networking quota limit has been reached. The quota might not