diff options
author | Aaron Huang <huangaaron@google.com> | 2021-12-10 02:12:38 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-10 02:12:38 +0000 |
commit | 610b5855026138e198a04e47efff0652231477b2 (patch) | |
tree | eafc1d6014f8816fb78e3241b08a3f0133a2d487 | |
parent | 62749e874a56a6203fe0f2d996f8203dd04f63f8 (diff) | |
parent | 185b02f1bc684e51c2bcb22c0877182a1155e195 (diff) | |
download | base-610b5855026138e198a04e47efff0652231477b2.tar.gz |
Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT"
-rw-r--r-- | packages/ConnectivityT/framework-t/Android.bp (renamed from packages/Nsd/framework/Android.bp) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/aidl-export/android/net/nsd/NsdServiceInfo.aidl (renamed from packages/Nsd/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/nsd/INsdManager.aidl (renamed from packages/Nsd/framework/src/android/net/nsd/INsdManager.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/nsd/INsdManagerCallback.aidl (renamed from packages/Nsd/framework/src/android/net/nsd/INsdManagerCallback.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/nsd/INsdServiceConnector.aidl (renamed from packages/Nsd/framework/src/android/net/nsd/INsdServiceConnector.aidl) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/nsd/NsdManager.java (renamed from packages/Nsd/framework/src/android/net/nsd/NsdManager.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/nsd/NsdServiceInfo.java (renamed from packages/Nsd/framework/src/android/net/nsd/NsdServiceInfo.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/Android.bp (renamed from packages/Nsd/service/Android.bp) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/INativeDaemonConnectorCallbacks.java (renamed from packages/Nsd/service/src/com/android/server/INativeDaemonConnectorCallbacks.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/NativeDaemonConnector.java (renamed from packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/NativeDaemonConnectorException.java (renamed from packages/Nsd/service/src/com/android/server/NativeDaemonConnectorException.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/NativeDaemonEvent.java (renamed from packages/Nsd/service/src/com/android/server/NativeDaemonEvent.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/NativeDaemonTimeoutException.java (renamed from packages/Nsd/service/src/com/android/server/NativeDaemonTimeoutException.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/service/src/com/android/server/NsdService.java (renamed from packages/Nsd/service/src/com/android/server/NsdService.java) | 0 | ||||
-rw-r--r-- | packages/ConnectivityT/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java (renamed from packages/Nsd/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java) | 0 | ||||
-rw-r--r-- | packages/Nsd/OWNERS | 1 |
16 files changed, 0 insertions, 1 deletions
diff --git a/packages/Nsd/framework/Android.bp b/packages/ConnectivityT/framework-t/Android.bp index 2363a9f8d4a3..2363a9f8d4a3 100644 --- a/packages/Nsd/framework/Android.bp +++ b/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 index 657bdd1e8706..657bdd1e8706 100644 --- a/packages/Nsd/framework/aidl-export/android/net/nsd/NsdServiceInfo.aidl +++ b/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 index 89e9cdbd4445..89e9cdbd4445 100644 --- a/packages/Nsd/framework/src/android/net/nsd/INsdManager.aidl +++ b/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 index 1a262ec0e9dd..1a262ec0e9dd 100644 --- a/packages/Nsd/framework/src/android/net/nsd/INsdManagerCallback.aidl +++ b/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 index b06ae55b150e..b06ae55b150e 100644 --- a/packages/Nsd/framework/src/android/net/nsd/INsdServiceConnector.aidl +++ b/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 index 6c597e26e042..6c597e26e042 100644 --- a/packages/Nsd/framework/src/android/net/nsd/NsdManager.java +++ b/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 index 0946499f164f..0946499f164f 100644 --- a/packages/Nsd/framework/src/android/net/nsd/NsdServiceInfo.java +++ b/packages/ConnectivityT/framework-t/src/android/net/nsd/NsdServiceInfo.java diff --git a/packages/Nsd/service/Android.bp b/packages/ConnectivityT/service/Android.bp index 529f58d130ed..529f58d130ed 100644 --- a/packages/Nsd/service/Android.bp +++ b/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 index 0cf9dcde012d..0cf9dcde012d 100644 --- a/packages/Nsd/service/src/com/android/server/INativeDaemonConnectorCallbacks.java +++ b/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 index ec8d7798e17e..ec8d7798e17e 100644 --- a/packages/Nsd/service/src/com/android/server/NativeDaemonConnector.java +++ b/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 index 4d8881c68324..4d8881c68324 100644 --- a/packages/Nsd/service/src/com/android/server/NativeDaemonConnectorException.java +++ b/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 index 568369434629..568369434629 100644 --- a/packages/Nsd/service/src/com/android/server/NativeDaemonEvent.java +++ b/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 index 658f7d6264eb..658f7d6264eb 100644 --- a/packages/Nsd/service/src/com/android/server/NativeDaemonTimeoutException.java +++ b/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 index 497107dbf989..497107dbf989 100644 --- a/packages/Nsd/service/src/com/android/server/NsdService.java +++ b/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 index e2253a2151b0..e2253a2151b0 100644 --- a/packages/Nsd/tests/unit/java/com/android/server/NativeDaemonConnectorTest.java +++ b/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 4862377852ac..000000000000 --- a/packages/Nsd/OWNERS +++ /dev/null @@ -1 +0,0 @@ -file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
\ No newline at end of file |