1 files changed, 0 insertions, 166 deletions
diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java
deleted file mode 100644
index f3508c1..0000000
--- a/core/java/android/net/DhcpInfoInternal.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.text.TextUtils;
-import android.util.Log;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * A simple object for retrieving the results of a DHCP request.
- * Replaces (internally) the IPv4-only DhcpInfo class.
- * @hide
- */
-public class DhcpInfoInternal {
-    private final static String TAG = "DhcpInfoInternal";
-    public String ipAddress;
-    public int prefixLength;
-
-    public String dns1;
-    public String dns2;
-
-    public String serverAddress;
-    public int leaseDuration;
-
-    /**
-     * Vendor specific information (from RFC 2132).
-     */
-    public String vendorInfo;
-
-    private Collection<RouteInfo> mRoutes;
-
-    public DhcpInfoInternal() {
-        mRoutes = new ArrayList<RouteInfo>();
-    }
-
-    public void addRoute(RouteInfo routeInfo) {
-        mRoutes.add(routeInfo);
-    }
-
-    public Collection<RouteInfo> getRoutes() {
-        return Collections.unmodifiableCollection(mRoutes);
-    }
-
-    private int convertToInt(String addr) {
-        if (addr != null) {
-            try {
-                InetAddress inetAddress = NetworkUtils.numericToInetAddress(addr);
-                if (inetAddress instanceof Inet4Address) {
-                    return NetworkUtils.inetAddressToInt(inetAddress);
-                }
-            } catch (IllegalArgumentException e) {}
-        }
-        return 0;
-    }
-
-    public DhcpInfo makeDhcpInfo() {
-        DhcpInfo info = new DhcpInfo();
-        info.ipAddress = convertToInt(ipAddress);
-        for (RouteInfo route : mRoutes) {
-            if (route.isDefaultRoute()) {
-                info.gateway = convertToInt(route.getGateway().getHostAddress());
-                break;
-            }
-        }
-        try {
-            InetAddress inetAddress = NetworkUtils.numericToInetAddress(ipAddress);
-            info.netmask = NetworkUtils.prefixLengthToNetmaskInt(prefixLength);
-        } catch (IllegalArgumentException e) {}
-        info.dns1 = convertToInt(dns1);
-        info.dns2 = convertToInt(dns2);
-        info.serverAddress = convertToInt(serverAddress);
-        info.leaseDuration = leaseDuration;
-        return info;
-    }
-
-    public LinkAddress makeLinkAddress() {
-        if (TextUtils.isEmpty(ipAddress)) {
-            Log.e(TAG, "makeLinkAddress with empty ipAddress");
-            return null;
-        }
-        return new LinkAddress(NetworkUtils.numericToInetAddress(ipAddress), prefixLength);
-    }
-
-    public LinkProperties makeLinkProperties() {
-        LinkProperties p = new LinkProperties();
-        p.addLinkAddress(makeLinkAddress());
-        for (RouteInfo route : mRoutes) {
-            p.addRoute(route);
-        }
-        //if empty, connectivity configures default DNS
-        if (TextUtils.isEmpty(dns1) == false) {
-            p.addDns(NetworkUtils.numericToInetAddress(dns1));
-        } else {
-            Log.d(TAG, "makeLinkProperties with empty dns1!");
-        }
-        if (TextUtils.isEmpty(dns2) == false) {
-            p.addDns(NetworkUtils.numericToInetAddress(dns2));
-        } else {
-            Log.d(TAG, "makeLinkProperties with empty dns2!");
-        }
-        return p;
-    }
-
-    /* Updates the DHCP fields that need to be retained from
-     * original DHCP request if the DHCP renewal shows them as
-     * being empty
-     */
-    public void updateFromDhcpRequest(DhcpInfoInternal orig) {
-        if (orig == null) return;
-
-        if (TextUtils.isEmpty(dns1)) {
-            dns1 = orig.dns1;
-        }
-
-        if (TextUtils.isEmpty(dns2)) {
-            dns2 = orig.dns2;
-        }
-
-        if (mRoutes.size() == 0) {
-            for (RouteInfo route : orig.getRoutes()) {
-                addRoute(route);
-            }
-        }
-    }
-
-    /**
-     * Test if this DHCP lease includes vendor hint that network link is
-     * metered, and sensitive to heavy data transfers.
-     */
-    public boolean hasMeteredHint() {
-        if (vendorInfo != null) {
-            return vendorInfo.contains("ANDROID_METERED");
-        } else {
-            return false;
-        }
-    }
-
-    public String toString() {
-        String routeString = "";
-        for (RouteInfo route : mRoutes) routeString += route.toString() + " | ";
-        return "addr: " + ipAddress + "/" + prefixLength +
-                " mRoutes: " + routeString +
-                " dns: " + dns1 + "," + dns2 +
-                " dhcpServer: " + serverAddress +
-                " leaseDuration: " + leaseDuration;
-    }
-}