| commit | e500616efd0637a8e78b2f50d5c5687a74b94acb | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Wed Dec 08 15:24:57 2021 +0800 |
| committer | Aaron Huang <huangaaron@google.com> | Thu Dec 09 16:22:00 2021 +0800 |
| tree | 3120545785622f29b45ae566c3dd0e85520f5ad3 | |
| parent | 8823a30b6f2ebfb7a48090e8b6e361831b029365 [diff] |
Move f/b/packages/Nsd files to f/b/packages/ConnectivityT
Move Nsd files to ConnectivityT so that nsd, ipsec,
ethernet and netstats files can live in the same
directory and it will be easier to move everything
in frameworks/base/packages/ConnectivityT to
packages/modules/Connectivity after fixing all of the
hidden API usages.
Bug: 204153604
Test: FrameworksNetTests
CtsNetTestCases
Change-Id: I411e242e8739d15920cfc2fe274115f7f39bd89f
diff --git a/packages/Nsd/framework/Android.bp b/framework-t/Sources.bp similarity index 100% rename from packages/Nsd/framework/Android.bp rename to framework-t/Sources.bp
diff --git a/packages/Nsd/framework/src/android/net/nsd/INsdManager.aidl b/framework-t/src/android/net/nsd/INsdManager.aidl similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/INsdManager.aidl rename to framework-t/src/android/net/nsd/INsdManager.aidl
diff --git a/packages/Nsd/framework/src/android/net/nsd/INsdManagerCallback.aidl b/framework-t/src/android/net/nsd/INsdManagerCallback.aidl similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/INsdManagerCallback.aidl rename to framework-t/src/android/net/nsd/INsdManagerCallback.aidl
diff --git a/packages/Nsd/framework/src/android/net/nsd/INsdServiceConnector.aidl b/framework-t/src/android/net/nsd/INsdServiceConnector.aidl similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/INsdServiceConnector.aidl rename to framework-t/src/android/net/nsd/INsdServiceConnector.aidl
diff --git a/packages/Nsd/framework/src/android/net/nsd/NsdManager.java b/framework-t/src/android/net/nsd/NsdManager.java similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/NsdManager.java rename to framework-t/src/android/net/nsd/NsdManager.java
diff --git a/packages/Nsd/framework/src/android/net/nsd/NsdServiceInfo.java b/framework-t/src/android/net/nsd/NsdServiceInfo.java similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/NsdServiceInfo.java rename to framework-t/src/android/net/nsd/NsdServiceInfo.java
diff --git a/packages/Nsd/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl b/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl similarity index 100% rename from packages/Nsd/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl rename to framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl
diff --git a/packages/Nsd/OWNERS b/packages/Nsd/OWNERS deleted file mode 100644 index 4862377..0000000 --- a/packages/Nsd/OWNERS +++ /dev/null
@@ -1 +0,0 @@ -file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking \ No newline at end of file
diff --git a/packages/Nsd/service/Android.bp b/service-t/Sources.bp similarity index 100% rename from packages/Nsd/service/Android.bp rename to service-t/Sources.bp
diff --git a/packages/Nsd/service/src/com/android/server/INativeDaemonConnectorCallbacks.java b/service-t/src/com/android/server/INativeDaemonConnectorCallbacks.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/INativeDaemonConnectorCallbacks.java rename to service-t/src/com/android/server/INativeDaemonConnectorCallbacks.java
diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java b/service-t/src/com/android/server/NativeDaemonConnector.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java rename to service-t/src/com/android/server/NativeDaemonConnector.java
diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonConnectorException.java b/service-t/src/com/android/server/NativeDaemonConnectorException.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonConnectorException.java rename to service-t/src/com/android/server/NativeDaemonConnectorException.java
diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonEvent.java b/service-t/src/com/android/server/NativeDaemonEvent.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonEvent.java rename to service-t/src/com/android/server/NativeDaemonEvent.java
diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonTimeoutException.java b/service-t/src/com/android/server/NativeDaemonTimeoutException.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonTimeoutException.java rename to service-t/src/com/android/server/NativeDaemonTimeoutException.java
diff --git a/packages/Nsd/service/src/com/android/server/NsdService.java b/service-t/src/com/android/server/NsdService.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NsdService.java rename to service-t/src/com/android/server/NsdService.java
diff --git a/packages/Nsd/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java b/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java similarity index 100% rename from packages/Nsd/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java rename to tests/unit/java/com/android/server/NativeDaemonConnectorTest.java