commit 96ca91761e6857c1ca2e4fafe5b35e4b5fefe5a1
author Irfan Sheriff <isheriff@google.com> Tue Oct 05 16:12:25 2010 -0700
committer Irfan Sheriff <isheriff@google.com> Fri Oct 08 12:41:11 2010 -0700
tree 11c7362e48b1bcb28fa7bac091942af7c36d17ac
parent 38d509697c7d1f989509281cbd9cfaacf9a20ac3

Use LinkProperties for IP and proxy configuration

Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270

core/java/android/net/LinkAddress.java

diff --git a/core/java/android/net/LinkAddress.java b/core/java/android/net/LinkAddress.java
index cb302da..3f03a2a 100644
--- a/core/java/android/net/LinkAddress.java
+++ b/core/java/android/net/LinkAddress.java
@@ -34,26 +34,26 @@
     private final InetAddress address;
 
     /**
-     * Network prefix
+     * Network prefix length
      */
-    private final int prefix;
+    private final int prefixLength;
 
     public LinkAddress(InetAddress address, InetAddress mask) {
         this.address = address;
-        this.prefix = computeprefix(mask);
+        this.prefixLength = computeprefixLength(mask);
     }
 
-    public LinkAddress(InetAddress address, int prefix) {
+    public LinkAddress(InetAddress address, int prefixLength) {
         this.address = address;
-        this.prefix = prefix;
+        this.prefixLength = prefixLength;
     }
 
     public LinkAddress(InterfaceAddress interfaceAddress) {
         this.address = interfaceAddress.getAddress();
-        this.prefix = interfaceAddress.getNetworkPrefixLength();
+        this.prefixLength = interfaceAddress.getNetworkPrefixLength();
     }
 
-    private static int computeprefix(InetAddress mask) {
+    private static int computeprefixLength(InetAddress mask) {
         int count = 0;
         for (byte b : mask.getAddress()) {
             for (int i = 0; i < 8; ++i) {
@@ -67,12 +67,12 @@
 
     @Override
     public String toString() {
-        return (address == null ? "" : (address.getHostAddress() + "/" + prefix));
+        return (address == null ? "" : (address.getHostAddress() + "/" + prefixLength));
     }
 
     /**
      * Compares this {@code LinkAddress} instance against the specified address
-     * in {@code obj}. Two addresses are equal if their InetAddress and prefix
+     * in {@code obj}. Two addresses are equal if their InetAddress and prefixLength
      * are equal
      *
      * @param obj the object to be tested for equality.
@@ -85,7 +85,7 @@
         }
         LinkAddress linkAddress = (LinkAddress) obj;
         return this.address.equals(linkAddress.address) &&
-            this.prefix == linkAddress.prefix;
+            this.prefixLength == linkAddress.prefixLength;
     }
 
     /**
@@ -98,8 +98,8 @@
     /**
      * Get network prefix length
      */
-    public int getNetworkPrefix() {
-        return prefix;
+    public int getNetworkPrefixLength() {
+        return prefixLength;
     }
 
     /**
@@ -118,7 +118,7 @@
         if (address != null) {
             dest.writeByte((byte)1);
             dest.writeByteArray(address.getAddress());
-            dest.writeInt(prefix);
+            dest.writeInt(prefixLength);
         } else {
             dest.writeByte((byte)0);
         }
@@ -132,14 +132,14 @@
         new Creator<LinkAddress>() {
             public LinkAddress createFromParcel(Parcel in) {
                 InetAddress address = null;
-                int prefix = 0;
+                int prefixLength = 0;
                 if (in.readByte() == 1) {
                     try {
                         address = InetAddress.getByAddress(in.createByteArray());
-                        prefix = in.readInt();
+                        prefixLength = in.readInt();
                     } catch (UnknownHostException e) { }
                 }
-                return new LinkAddress(address, prefix);
+                return new LinkAddress(address, prefixLength);
             }
 
             public LinkAddress[] newArray(int size) {