summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-07-14 12:23:28 -0700
committerWink Saville <wink@google.com>2011-07-14 12:23:28 -0700
commitc9822c5aeae833bb4a586c7af8a7b2641e8c17ae (patch)
tree5090feb0a367e93c2e67f1966fb02c5f7068ccbe /services/java/com
parentd44264a5eebbecc5ae02f9036d61b888d494e133 (diff)
downloadframeworks_base-c9822c5aeae833bb4a586c7af8a7b2641e8c17ae.zip
frameworks_base-c9822c5aeae833bb4a586c7af8a7b2641e8c17ae.tar.gz
frameworks_base-c9822c5aeae833bb4a586c7af8a7b2641e8c17ae.tar.bz2
Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes happening in Master caused the build to break. Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/ConnectivityService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 68cdeee..85891a2 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -33,6 +33,7 @@ import android.net.EthernetDataTracker;
import android.net.IConnectivityManager;
import android.net.INetworkPolicyListener;
import android.net.INetworkPolicyManager;
+import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.LinkProperties.CompareAddressesResult;
import android.net.MobileDataStateTracker;
@@ -77,6 +78,7 @@ import com.google.android.collect.Sets;
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;