Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" am: 610b585502 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914528 Change-Id: I9675aa02c8271ecc9d8d11c5cb544f56d8ff1f93

commit: aa29ed6ebbea8f4f2080289b3978dfb7f9d3bca4 [log] [tgz]
author: Aaron Huang <huangaaron@google.com> Fri Dec 10 02:30:08 2021 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 02:30:08 2021 +0000
tree: 3120545785622f29b45ae566c3dd0e85520f5ad3
parent: 5b08cd89e58207a59581371fb4b4b550b50e1c0e [diff]
parent: 874001496b9375b255f4ddca309439cee54da849 [diff]
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
commit	aa29ed6ebbea8f4f2080289b3978dfb7f9d3bca4	[log] [tgz]
author	Aaron Huang <huangaaron@google.com>	Fri Dec 10 02:30:08 2021 +0000
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	Fri Dec 10 02:30:08 2021 +0000
tree	3120545785622f29b45ae566c3dd0e85520f5ad3
parent	5b08cd89e58207a59581371fb4b4b550b50e1c0e [diff]
parent	874001496b9375b255f4ddca309439cee54da849 [diff]