diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-08-08 06:02:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 06:02:06 -0700 |
| commit | 5833474d58a93510f9d82740d9d5b5cdbd86814e (patch) | |
| tree | 2a47ea484d1db79bc626df24cf4f5db89f09a21e /services/net/java | |
| parent | 6b9ab57b2d02167d12af451dde3d48dcae17d4d8 (diff) | |
| parent | e921001f2d2cbb38053773a35ffba86a6d14c384 (diff) | |
Merge "Fix interfaceVersion in DhcpServerCallbacks"
am: e921001f2d
Change-Id: I5e917252cc3632a823d3912094066f96597da3ae
Diffstat (limited to 'services/net/java')
| -rw-r--r-- | services/net/java/android/net/dhcp/DhcpServerCallbacks.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/net/java/android/net/dhcp/DhcpServerCallbacks.java b/services/net/java/android/net/dhcp/DhcpServerCallbacks.java index bb56876c77f5..7c41377985d3 100644 --- a/services/net/java/android/net/dhcp/DhcpServerCallbacks.java +++ b/services/net/java/android/net/dhcp/DhcpServerCallbacks.java @@ -21,13 +21,11 @@ package android.net.dhcp; * @hide */ public abstract class DhcpServerCallbacks extends IDhcpServerCallbacks.Stub { - // TODO: add @Override here once the API is versioned - /** * Get the version of the aidl interface implemented by the callbacks. */ + @Override public int getInterfaceVersion() { - // TODO: return IDhcpServerCallbacks.VERSION; - return 0; + return IDhcpServerCallbacks.VERSION; } } |