diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-19 11:43:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 11:43:49 -0700 |
| commit | 1b965941713a395dc8003cf8ee29a40f92dd77aa (patch) | |
| tree | fd241aefc47e9a08cd4dbacfd5d44df9296aa267 /core/java/android/net/DhcpInfoInternal.java | |
| parent | b4aed7f5c7b56dee063a6ee1819ba50f0b5298ca (diff) | |
| parent | 77b87ba0bc1c5de025976416b49e698ed9362814 (diff) | |
| download | frameworks_base-1b965941713a395dc8003cf8ee29a40f92dd77aa.zip frameworks_base-1b965941713a395dc8003cf8ee29a40f92dd77aa.tar.gz frameworks_base-1b965941713a395dc8003cf8ee29a40f92dd77aa.tar.bz2 | |
Merge "Pipe DHCP vendor info towards framework."
Diffstat (limited to 'core/java/android/net/DhcpInfoInternal.java')
| -rw-r--r-- | core/java/android/net/DhcpInfoInternal.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java index fa77bc5..7ab8047 100644 --- a/core/java/android/net/DhcpInfoInternal.java +++ b/core/java/android/net/DhcpInfoInternal.java @@ -19,9 +19,8 @@ package android.net; import android.text.TextUtils; import android.util.Log; -import java.net.InetAddress; import java.net.Inet4Address; -import java.net.UnknownHostException; +import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -42,6 +41,11 @@ public class DhcpInfoInternal { public String serverAddress; public int leaseDuration; + /** + * Vendor specific information (from RFC 2132). + */ + public String vendorInfo; + private Collection<RouteInfo> mRoutes; public DhcpInfoInternal() { |