commit f40ca1b0f3c2cb7a85d64dfee3e408826a569f41
author Robert Greenwalt <rgreenwalt@google.com> Thu Jun 12 16:53:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 12 16:53:43 2014 +0000
tree f18f003d272b595bd3b167e16d4cbcc391bcaee9
parent 8e33e456a111948bf49c91eff88db6975959eb9d
parent c879e20e423a0611a4effcfce1b90251710e1b4c

am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev

* commit 'fe5ca9646f86e041ed7729ecd0a006428806acf2':
  Fix public API of LinkProperties.

services/core/java/com/android/server/net/IpConfigStore.java

diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java
index bb0d5fe..907eeb2 100644
--- a/services/core/java/com/android/server/net/IpConfigStore.java
+++ b/services/core/java/com/android/server/net/IpConfigStore.java
@@ -81,15 +81,15 @@
                     for (LinkAddress linkAddr : linkProperties.getLinkAddresses()) {
                         out.writeUTF(LINK_ADDRESS_KEY);
                         out.writeUTF(linkAddr.getAddress().getHostAddress());
-                        out.writeInt(linkAddr.getNetworkPrefixLength());
+                        out.writeInt(linkAddr.getPrefixLength());
                     }
                     for (RouteInfo route : linkProperties.getRoutes()) {
                         out.writeUTF(GATEWAY_KEY);
-                        LinkAddress dest = route.getDestination();
+                        LinkAddress dest = route.getDestinationLinkAddress();
                         if (dest != null) {
                             out.writeInt(1);
                             out.writeUTF(dest.getAddress().getHostAddress());
-                            out.writeInt(dest.getNetworkPrefixLength());
+                            out.writeInt(dest.getPrefixLength());
                         } else {
                             out.writeInt(0);
                         }