Snap for 10843824 from 1b5ff0453f5fc7d33b7cfed157b91bce50751c00 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I67eac420ec6b204b19bd6ff3b08965d4ee7cf800

7 files changed, 6 insertions, 133 deletions

diff --git a/OWNERS b/OWNERS
index 82020cc..c858ef9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,8 @@
 # Bug component: 1203089
 
+handaw@google.com
 jonhui@google.com
+sunytt@google.com
 wgtdkp@google.com
 xyk@google.com
 yuwenlan@google.com
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6b82d85
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# ThreadNetwork
+
+This project has been moved to `packages/modules/Connectivity/thread`.
diff --git a/apex/Android.bp b/apex/Android.bp
index 48659e5..e4ab29f 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -21,14 +21,7 @@ package {
 apex_defaults {
     name: "com.android.threadnetwork-defaults",
     min_sdk_version: "current",
-    systemserverclasspath_fragments: ["com.android.threadnetwork-systemserverclasspath-fragment"],
-    binaries: [
-        "ot-daemon",
-        "ot-ctl",
-    ],
-    compile_multilib: "both",
-    prebuilts: ["com.android.threadnetwork.init.rc"],
-
+    file_contexts: ":apex.test-file_contexts",
     manifest: "apex_manifest.json",
     key: "com.android.threadnetwork.key",
     certificate: ":com.android.threadnetwork.certificate",
@@ -42,22 +35,6 @@ apex {
     ],
 }
 
-// threadnetwork apex with INT_MAX version code, to allow for upgrade/rollback testing.
-apex_test {
-    name: "test_com.android.threadnetwork",
-    defaults: ["com.android.threadnetwork-defaults"],
-    manifest: "test_apex_manifest.json",
-    file_contexts: ":com.android.threadnetwork-file_contexts",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "com.android.threadnetwork.init.rc",
-    src: "threadnetwork.rc",
-    filename: "init.rc",
-    installable: false,
-}
-
 apex_key {
     name: "com.android.threadnetwork.key",
     public_key: "com.android.threadnetwork.avbpubkey",
@@ -68,9 +45,3 @@ android_app_certificate {
     name: "com.android.threadnetwork.certificate",
     certificate: "com.android.threadnetwork",
 }
-
-systemserverclasspath_fragment {
-    name: "com.android.threadnetwork-systemserverclasspath-fragment",
-    standalone_contents: ["service-threadnetwork"],
-    apex_available: ["com.android.threadnetwork"],
-}
diff --git a/apex/test_apex_manifest.json b/apex/test_apex_manifest.json
deleted file mode 100644
index a3e9804..0000000
--- a/apex/test_apex_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-      "name": "com.android.threadnetwork",
-        "version": 2147483647
-}
diff --git a/apex/threadnetwork.rc b/apex/threadnetwork.rc
deleted file mode 100644
index 8fc41e1..0000000
--- a/apex/threadnetwork.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-service ot-daemon /apex/com.android.threadnetwork/bin/ot-daemon -I thread-wpan threadnetwork_hal://binder?none
-    disabled
-    updatable
-    class main
-    user thread_network
-    group thread_network inet system
-    seclabel u:r:ot_daemon:s0
-    override
diff --git a/service/Android.bp b/service/Android.bp
deleted file mode 100644
index a5aaa98..0000000
--- a/service/Android.bp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-filegroup {
-    name: "service-threadnetwork-srcs",
-    srcs: [
-        "java/**/*.java",
-    ],
-}
-
-java_defaults {
-    name: "service-threadnetwork-defaults",
-    min_sdk_version: "current",
-    errorprone: {
-        javacflags: ["-Xep:CheckReturnValue:ERROR"],
-    },
-}
-
-// service-threadnetwork static library
-// ==============================================================
-java_library {
-    name: "service-threadnetwork",
-    defaults: ["service-threadnetwork-defaults"],
-    sdk_version: "system_server_current",
-    installable: true,
-    srcs: [ ":service-threadnetwork-srcs" ],
-    visibility: [
-        "//packages/modules/ThreadNetwork/apex",
-    ],
-    apex_available: [
-        "com.android.threadnetwork",
-    ],
-}
diff --git a/service/java/com/android/server/threadnetwork/ThreadNetworkService.java b/service/java/com/android/server/threadnetwork/ThreadNetworkService.java
deleted file mode 100644
index 641d06e..0000000
--- a/service/java/com/android/server/threadnetwork/ThreadNetworkService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.threadnetwork;
-
-/**
- * A placeholder java class: it doesn't build if there are no source files for
- * "service-threadnetwork" target.
- *
- * Should be replaced by the real service implementation soon.
- */
-public class ThreadNetworkService {
-
-}