summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/net/java/android/net/ip/IpReachabilityMonitor.java (renamed from core/java/android/net/IpReachabilityMonitor.java)2
-rw-r--r--services/net/java/android/net/netlink/NetlinkConstants.java (renamed from core/java/android/net/netlink/NetlinkConstants.java)0
-rw-r--r--services/net/java/android/net/netlink/NetlinkErrorMessage.java (renamed from core/java/android/net/netlink/NetlinkErrorMessage.java)0
-rw-r--r--services/net/java/android/net/netlink/NetlinkMessage.java (renamed from core/java/android/net/netlink/NetlinkMessage.java)0
-rw-r--r--services/net/java/android/net/netlink/NetlinkSocket.java (renamed from core/java/android/net/netlink/NetlinkSocket.java)0
-rw-r--r--services/net/java/android/net/netlink/RtNetlinkNeighborMessage.java (renamed from core/java/android/net/netlink/RtNetlinkNeighborMessage.java)0
-rw-r--r--services/net/java/android/net/netlink/StructNdMsg.java (renamed from core/java/android/net/netlink/StructNdMsg.java)0
-rw-r--r--services/net/java/android/net/netlink/StructNdaCacheInfo.java (renamed from core/java/android/net/netlink/StructNdaCacheInfo.java)0
-rw-r--r--services/net/java/android/net/netlink/StructNlAttr.java (renamed from core/java/android/net/netlink/StructNlAttr.java)0
-rw-r--r--services/net/java/android/net/netlink/StructNlMsgErr.java (renamed from core/java/android/net/netlink/StructNlMsgErr.java)0
-rw-r--r--services/net/java/android/net/netlink/StructNlMsgHdr.java (renamed from core/java/android/net/netlink/StructNlMsgHdr.java)0
-rw-r--r--services/tests/servicestests/src/android/net/netlink/NetlinkErrorMessageTest.java (renamed from core/tests/coretests/src/android/net/netlink/NetlinkErrorMessageTest.java)0
-rw-r--r--services/tests/servicestests/src/android/net/netlink/NetlinkSocketTest.java (renamed from core/tests/coretests/src/android/net/netlink/NetlinkSocketTest.java)0
-rw-r--r--services/tests/servicestests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java (renamed from core/tests/coretests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java)0
14 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/IpReachabilityMonitor.java b/services/net/java/android/net/ip/IpReachabilityMonitor.java
index 2283004c7759..3acd56560f4a 100644
--- a/core/java/android/net/IpReachabilityMonitor.java
+++ b/services/net/java/android/net/ip/IpReachabilityMonitor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.net;
+package android.net.ip;
import com.android.internal.annotations.GuardedBy;
diff --git a/core/java/android/net/netlink/NetlinkConstants.java b/services/net/java/android/net/netlink/NetlinkConstants.java
index e331701efbce..e331701efbce 100644
--- a/core/java/android/net/netlink/NetlinkConstants.java
+++ b/services/net/java/android/net/netlink/NetlinkConstants.java
diff --git a/core/java/android/net/netlink/NetlinkErrorMessage.java b/services/net/java/android/net/netlink/NetlinkErrorMessage.java
index e2755740453a..e2755740453a 100644
--- a/core/java/android/net/netlink/NetlinkErrorMessage.java
+++ b/services/net/java/android/net/netlink/NetlinkErrorMessage.java
diff --git a/core/java/android/net/netlink/NetlinkMessage.java b/services/net/java/android/net/netlink/NetlinkMessage.java
index 3bf75cabea17..3bf75cabea17 100644
--- a/core/java/android/net/netlink/NetlinkMessage.java
+++ b/services/net/java/android/net/netlink/NetlinkMessage.java
diff --git a/core/java/android/net/netlink/NetlinkSocket.java b/services/net/java/android/net/netlink/NetlinkSocket.java
index 657d48c15250..657d48c15250 100644
--- a/core/java/android/net/netlink/NetlinkSocket.java
+++ b/services/net/java/android/net/netlink/NetlinkSocket.java
diff --git a/core/java/android/net/netlink/RtNetlinkNeighborMessage.java b/services/net/java/android/net/netlink/RtNetlinkNeighborMessage.java
index 02df1313c43f..02df1313c43f 100644
--- a/core/java/android/net/netlink/RtNetlinkNeighborMessage.java
+++ b/services/net/java/android/net/netlink/RtNetlinkNeighborMessage.java
diff --git a/core/java/android/net/netlink/StructNdMsg.java b/services/net/java/android/net/netlink/StructNdMsg.java
index b68ec0bc6226..b68ec0bc6226 100644
--- a/core/java/android/net/netlink/StructNdMsg.java
+++ b/services/net/java/android/net/netlink/StructNdMsg.java
diff --git a/core/java/android/net/netlink/StructNdaCacheInfo.java b/services/net/java/android/net/netlink/StructNdaCacheInfo.java
index 16cf56385eb8..16cf56385eb8 100644
--- a/core/java/android/net/netlink/StructNdaCacheInfo.java
+++ b/services/net/java/android/net/netlink/StructNdaCacheInfo.java
diff --git a/core/java/android/net/netlink/StructNlAttr.java b/services/net/java/android/net/netlink/StructNlAttr.java
index 597a6aa1c9eb..597a6aa1c9eb 100644
--- a/core/java/android/net/netlink/StructNlAttr.java
+++ b/services/net/java/android/net/netlink/StructNlAttr.java
diff --git a/core/java/android/net/netlink/StructNlMsgErr.java b/services/net/java/android/net/netlink/StructNlMsgErr.java
index f095af43c743..f095af43c743 100644
--- a/core/java/android/net/netlink/StructNlMsgErr.java
+++ b/services/net/java/android/net/netlink/StructNlMsgErr.java
diff --git a/core/java/android/net/netlink/StructNlMsgHdr.java b/services/net/java/android/net/netlink/StructNlMsgHdr.java
index 98ab5e719d69..98ab5e719d69 100644
--- a/core/java/android/net/netlink/StructNlMsgHdr.java
+++ b/services/net/java/android/net/netlink/StructNlMsgHdr.java
diff --git a/core/tests/coretests/src/android/net/netlink/NetlinkErrorMessageTest.java b/services/tests/servicestests/src/android/net/netlink/NetlinkErrorMessageTest.java
index e677475f5907..e677475f5907 100644
--- a/core/tests/coretests/src/android/net/netlink/NetlinkErrorMessageTest.java
+++ b/services/tests/servicestests/src/android/net/netlink/NetlinkErrorMessageTest.java
diff --git a/core/tests/coretests/src/android/net/netlink/NetlinkSocketTest.java b/services/tests/servicestests/src/android/net/netlink/NetlinkSocketTest.java
index c599fe3e5b76..c599fe3e5b76 100644
--- a/core/tests/coretests/src/android/net/netlink/NetlinkSocketTest.java
+++ b/services/tests/servicestests/src/android/net/netlink/NetlinkSocketTest.java
diff --git a/core/tests/coretests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java b/services/tests/servicestests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java
index 19ee00036b61..19ee00036b61 100644
--- a/core/tests/coretests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java
+++ b/services/tests/servicestests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java