From 185b02f1bc684e51c2bcb22c0877182a1155e195 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Wed, 8 Dec 2021 15:24:57 +0800 Subject: [PATCH] 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 --- packages/{Nsd/framework => ConnectivityT/framework-t}/Android.bp | 0 .../framework-t}/aidl-export/android/net/nsd/NsdServiceInfo.aidl | 0 .../framework-t}/src/android/net/nsd/INsdManager.aidl | 0 .../framework-t}/src/android/net/nsd/INsdManagerCallback.aidl | 0 .../framework-t}/src/android/net/nsd/INsdServiceConnector.aidl | 0 .../framework-t}/src/android/net/nsd/NsdManager.java | 0 .../framework-t}/src/android/net/nsd/NsdServiceInfo.java | 0 packages/{Nsd => ConnectivityT}/service/Android.bp | 0 .../src/com/android/server/INativeDaemonConnectorCallbacks.java | 0 .../service/src/com/android/server/NativeDaemonConnector.java | 0 .../src/com/android/server/NativeDaemonConnectorException.java | 0 .../service/src/com/android/server/NativeDaemonEvent.java | 0 .../src/com/android/server/NativeDaemonTimeoutException.java | 0 .../service/src/com/android/server/NsdService.java | 0 .../unit/java/com/android/server/NativeDaemonConnectorTest.java | 0 packages/Nsd/OWNERS | 1 - 16 files changed, 1 deletion(-) rename packages/{Nsd/framework => ConnectivityT/framework-t}/Android.bp (100%) rename packages/{Nsd/framework => ConnectivityT/framework-t}/aidl-export/android/net/nsd/NsdServiceInfo.aidl (100%) rename packages/{Nsd/framework => ConnectivityT/framework-t}/src/android/net/nsd/INsdManager.aidl (100%) rename packages/{Nsd/framework => ConnectivityT/framework-t}/src/android/net/nsd/INsdManagerCallback.aidl (100%) rename packages/{Nsd/framework => ConnectivityT/framework-t}/src/android/net/nsd/INsdServiceConnector.aidl (100%) rename packages/{Nsd/framework => ConnectivityT/framework-t}/src/android/net/nsd/NsdManager.java (100%) rename packages/{Nsd/framework => ConnectivityT/framework-t}/src/android/net/nsd/NsdServiceInfo.java (100%) rename packages/{Nsd => ConnectivityT}/service/Android.bp (100%) rename packages/{Nsd => ConnectivityT}/service/src/com/android/server/INativeDaemonConnectorCallbacks.java (100%) rename packages/{Nsd => ConnectivityT}/service/src/com/android/server/NativeDaemonConnector.java (100%) rename packages/{Nsd => ConnectivityT}/service/src/com/android/server/NativeDaemonConnectorException.java (100%) rename packages/{Nsd => ConnectivityT}/service/src/com/android/server/NativeDaemonEvent.java (100%) rename packages/{Nsd => ConnectivityT}/service/src/com/android/server/NativeDaemonTimeoutException.java (100%) rename packages/{Nsd => ConnectivityT}/service/src/com/android/server/NsdService.java (100%) rename packages/{Nsd => ConnectivityT}/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java (100%) delete mode 100644 packages/Nsd/OWNERS diff --git a/packages/Nsd/framework/Android.bp b/packages/ConnectivityT/framework-t/Android.bp similarity index 100% rename from packages/Nsd/framework/Android.bp rename to packages/ConnectivityT/framework-t/Android.bp diff --git a/packages/Nsd/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl b/packages/ConnectivityT/framework-t/aidl-export/android/net/nsd/NsdServiceInfo.aidl similarity index 100% rename from packages/Nsd/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl rename to packages/ConnectivityT/framework-t/aidl-export/android/net/nsd/NsdServiceInfo.aidl diff --git a/packages/Nsd/framework/src/android/net/nsd/INsdManager.aidl b/packages/ConnectivityT/framework-t/src/android/net/nsd/INsdManager.aidl similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/INsdManager.aidl rename to packages/ConnectivityT/framework-t/src/android/net/nsd/INsdManager.aidl diff --git a/packages/Nsd/framework/src/android/net/nsd/INsdManagerCallback.aidl b/packages/ConnectivityT/framework-t/src/android/net/nsd/INsdManagerCallback.aidl similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/INsdManagerCallback.aidl rename to packages/ConnectivityT/framework-t/src/android/net/nsd/INsdManagerCallback.aidl diff --git a/packages/Nsd/framework/src/android/net/nsd/INsdServiceConnector.aidl b/packages/ConnectivityT/framework-t/src/android/net/nsd/INsdServiceConnector.aidl similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/INsdServiceConnector.aidl rename to packages/ConnectivityT/framework-t/src/android/net/nsd/INsdServiceConnector.aidl diff --git a/packages/Nsd/framework/src/android/net/nsd/NsdManager.java b/packages/ConnectivityT/framework-t/src/android/net/nsd/NsdManager.java similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/NsdManager.java rename to packages/ConnectivityT/framework-t/src/android/net/nsd/NsdManager.java diff --git a/packages/Nsd/framework/src/android/net/nsd/NsdServiceInfo.java b/packages/ConnectivityT/framework-t/src/android/net/nsd/NsdServiceInfo.java similarity index 100% rename from packages/Nsd/framework/src/android/net/nsd/NsdServiceInfo.java rename to packages/ConnectivityT/framework-t/src/android/net/nsd/NsdServiceInfo.java diff --git a/packages/Nsd/service/Android.bp b/packages/ConnectivityT/service/Android.bp similarity index 100% rename from packages/Nsd/service/Android.bp rename to packages/ConnectivityT/service/Android.bp diff --git a/packages/Nsd/service/src/com/android/server/INativeDaemonConnectorCallbacks.java b/packages/ConnectivityT/service/src/com/android/server/INativeDaemonConnectorCallbacks.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/INativeDaemonConnectorCallbacks.java rename to packages/ConnectivityT/service/src/com/android/server/INativeDaemonConnectorCallbacks.java diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java b/packages/ConnectivityT/service/src/com/android/server/NativeDaemonConnector.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java rename to packages/ConnectivityT/service/src/com/android/server/NativeDaemonConnector.java diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonConnectorException.java b/packages/ConnectivityT/service/src/com/android/server/NativeDaemonConnectorException.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonConnectorException.java rename to packages/ConnectivityT/service/src/com/android/server/NativeDaemonConnectorException.java diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonEvent.java b/packages/ConnectivityT/service/src/com/android/server/NativeDaemonEvent.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonEvent.java rename to packages/ConnectivityT/service/src/com/android/server/NativeDaemonEvent.java diff --git a/packages/Nsd/service/src/com/android/server/NativeDaemonTimeoutException.java b/packages/ConnectivityT/service/src/com/android/server/NativeDaemonTimeoutException.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NativeDaemonTimeoutException.java rename to packages/ConnectivityT/service/src/com/android/server/NativeDaemonTimeoutException.java diff --git a/packages/Nsd/service/src/com/android/server/NsdService.java b/packages/ConnectivityT/service/src/com/android/server/NsdService.java similarity index 100% rename from packages/Nsd/service/src/com/android/server/NsdService.java rename to packages/ConnectivityT/service/src/com/android/server/NsdService.java diff --git a/packages/Nsd/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java b/packages/ConnectivityT/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 packages/ConnectivityT/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java diff --git a/packages/Nsd/OWNERS b/packages/Nsd/OWNERS deleted file mode 100644 index 4862377852ac3..0000000000000 --- a/packages/Nsd/OWNERS +++ /dev/null @@ -1 +0,0 @@ -file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking \ No newline at end of file