[DON'T BLOCK] Test ownership migration rules

This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, <add g3 doc link> Bug: 304529413 Test: N/A (cherry picked from https://android-review.googlesource.com/q/commit:a8ac702eb268d687d089ba218926ae6b17cda33c) Change-Id: I243f17b3f0ad7af9ffa15ca242456e36688733f5 Merged-In: I243f17b3f0ad7af9ffa15ca242456e36688733f5
2024-01-31 11:08:57 +00:00 · 2024-01-31 11:08:57 +00:00 · 985604c94f
commit 985604c94f
parent 5d787936cf
88 changed files with 239 additions and 109 deletions
--- a/Cronet/tests/common/Android.bp
+++ b/Cronet/tests/common/Android.bp
@ -17,6 +17,7 @@
 // They must be fast and stable, and exercise public or test APIs.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/Cronet/tests/cts/Android.bp
+++ b/Cronet/tests/cts/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -46,7 +47,9 @@ android_library {
        "framework-connectivity",
        "org.apache.http.legacy",
    ],
-    lint: { test: true }
+    lint: {
+        test: true,
+    },
 }

 android_test {
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/DnsResolver/Android.bp
+++ b/DnsResolver/Android.bp
@ -14,6 +14,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -56,7 +57,10 @@ cc_library {
 cc_test {
    name: "dns_helper_unit_test",
    defaults: ["netd_defaults"],
-    test_suites: ["general-tests", "mts-tethering"],
+    test_suites: [
+        "general-tests",
+        "mts-tethering",
+    ],
    test_config_template: ":net_native_test_config_template",
    header_libs: [
        "bpf_connectivity_headers",
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -92,7 +93,7 @@ apex {
        both: {
            jni_libs: [
                "libframework-connectivity-jni",
-                "libframework-connectivity-tiramisu-jni"
+                "libframework-connectivity-tiramisu-jni",
            ],
        },
    },
--- a/Tethering/apex/permissions/Android.bp
+++ b/Tethering/apex/permissions/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
    default_visibility: ["//packages/modules/Connectivity/Tethering:__subpackages__"],
 }
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@ -14,6 +14,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -55,7 +56,9 @@ java_sdk_library {

    hostdex: true, // for hiddenapi check
    permitted_packages: ["android.net"],
-    lint: { strict_updatability_linting: true },
+    lint: {
+        strict_updatability_linting: true,
+    },
 }

 java_library {
@ -88,7 +91,7 @@ java_defaults {
    name: "framework-tethering-defaults",
    defaults: ["framework-module-defaults"],
    srcs: [
-      ":framework-tethering-srcs"
+        ":framework-tethering-srcs",
    ],
    libs: ["framework-connectivity.stubs.module_lib"],
    aidl: {
@ -107,5 +110,5 @@ filegroup {
        "src/**/*.aidl",
        "src/**/*.java",
    ],
-    path: "src"
+    path: "src",
 }
--- a/Tethering/tests/Android.bp
+++ b/Tethering/tests/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -24,5 +25,5 @@ filegroup {
    visibility: [
        "//packages/modules/Connectivity/tests:__subpackages__",
        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
-    ]
+    ],
 }
--- a/Tethering/tests/integration/Android.bp
+++ b/Tethering/tests/integration/Android.bp
@ -14,6 +14,7 @@
 // limitations under the License.
 //
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -50,7 +51,7 @@ android_library {
    visibility: [
        "//packages/modules/Connectivity/Tethering/tests/mts",
        "//packages/modules/Connectivity/tests/cts/net",
-    ]
+    ],
 }

 // Library including tethering integration tests targeting the latest stable SDK.
@ -67,7 +68,7 @@ android_library {
        "//packages/modules/Connectivity/tests/cts/tethering",
        "//packages/modules/Connectivity/tests:__subpackages__",
        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
-    ]
+    ],
 }

 // Library including tethering integration tests targeting current development SDK.
@ -83,7 +84,7 @@ android_library {
    visibility: [
        "//packages/modules/Connectivity/tests/cts/tethering",
        "//packages/modules/Connectivity/Tethering/tests/mts",
-    ]
+    ],
 }

 // TODO: remove because TetheringIntegrationTests has been covered by ConnectivityCoverageTests.
--- a/Tethering/tests/mts/Android.bp
+++ b/Tethering/tests/mts/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/Tethering/tests/privileged/Android.bp
+++ b/Tethering/tests/privileged/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@ -16,6 +16,7 @@

 // Tests in this folder are included both in unit tests and CTS.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -23,7 +24,7 @@ java_library {
    name: "TetheringCommonTests",
    srcs: [
        "common/**/*.java",
-        "common/**/*.kt"
+        "common/**/*.kt",
    ],
    static_libs: [
        "androidx.test.rules",
@ -95,7 +96,7 @@ android_library {
    visibility: [
        "//packages/modules/Connectivity/tests:__subpackages__",
        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
-    ]
+    ],
 }

 android_test {
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@ -18,6 +18,7 @@
 // struct definitions shared with JNI
 //
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/clatd/Android.bp
+++ b/clatd/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["external_android-clat_license"],
 }

@ -54,7 +55,7 @@ cc_binary {
    defaults: ["clatd_defaults"],
    srcs: [
        ":clatd_common",
-        "main.c"
+        "main.c",
    ],
    static_libs: [
        "libip_checksum",
@ -101,7 +102,7 @@ cc_test {
    defaults: ["clatd_defaults"],
    srcs: [
        ":clatd_common",
-        "clatd_test.cpp"
+        "clatd_test.cpp",
    ],
    static_libs: [
        "libbase",
--- a/common/Android.bp
+++ b/common/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
@ -34,6 +35,7 @@ java_defaults {
    name: "enable-framework-connectivity-t-targets",
    enabled: true,
 }
+
 // The above defaults can be used to disable framework-connectivity t
 // targets while minimizing merge conflicts in the build rules.

--- a/framework/Android.bp
+++ b/framework/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/nearby/apex/Android.bp
+++ b/nearby/apex/Android.bp
@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/framework/Android.bp
+++ b/nearby/framework/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/service/proto/Android.bp
+++ b/nearby/service/proto/Android.bp
@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/tests/cts/fastpair/Android.bp
+++ b/nearby/tests/cts/fastpair/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/tests/integration/privileged/Android.bp
+++ b/nearby/tests/integration/privileged/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/tests/integration/untrusted/Android.bp
+++ b/nearby/tests/integration/untrusted/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/nearby/tests/unit/Android.bp
+++ b/nearby/tests/unit/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/netbpfload/Android.bp
+++ b/netbpfload/Android.bp
@ -14,6 +14,10 @@
 // limitations under the License.
 //

+package {
+    default_team: "trendy_team_fwk_core_networking",
+}
+
 cc_binary {
    name: "netbpfload",

--- a/netd/Android.bp
+++ b/netd/Android.bp
@ -14,6 +14,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -58,7 +59,10 @@ cc_library {
 cc_test {
    name: "netd_updatable_unit_test",
    defaults: ["netd_defaults"],
-    test_suites: ["general-tests", "mts-tethering"],
+    test_suites: [
+        "general-tests",
+        "mts-tethering",
+    ],
    test_config_template: ":net_native_test_config_template",
    require_root: true, // required by setrlimitForTest()
    header_libs: [
@ -66,7 +70,7 @@ cc_test {
    ],
    srcs: [
        "BpfHandlerTest.cpp",
-        "BpfBaseTest.cpp"
+        "BpfBaseTest.cpp",
    ],
    static_libs: [
        "libbase",
--- a/remoteauth/framework/Android.bp
+++ b/remoteauth/framework/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/remoteauth/service/Android.bp
+++ b/remoteauth/service/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/remoteauth/service/jni/Android.bp
+++ b/remoteauth/service/jni/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/remoteauth/tests/unit/Android.bp
+++ b/remoteauth/tests/unit/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/service-t/Android.bp
+++ b/service-t/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/service-t/native/libs/libnetworkstats/Android.bp
+++ b/service-t/native/libs/libnetworkstats/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -57,7 +58,10 @@ cc_library {

 cc_test {
    name: "libnetworkstats_test",
-    test_suites: ["general-tests", "mts-tethering"],
+    test_suites: [
+        "general-tests",
+        "mts-tethering",
+    ],
    test_config_template: ":net_native_test_config_template",
    require_root: true, // required by setrlimitForTest()
    header_libs: ["bpf_connectivity_headers"],
--- a/service/Android.bp
+++ b/service/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/service/ServiceConnectivityResources/Android.bp
+++ b/service/ServiceConnectivityResources/Android.bp
@ -16,6 +16,7 @@

 // APK to hold all the wifi overlayable resources.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/service/libconnectivity/Android.bp
+++ b/service/libconnectivity/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/service/native/libs/libclat/Android.bp
+++ b/service/native/libs/libclat/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -38,7 +39,10 @@ cc_library_static {
 cc_test {
    name: "libclat_test",
    defaults: ["netd_defaults"],
-    test_suites: ["general-tests", "mts-tethering"],
+    test_suites: [
+        "general-tests",
+        "mts-tethering",
+    ],
    test_config_template: ":net_native_test_config_template",
    srcs: [
        "clatutils_test.cpp",
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@ -28,6 +28,7 @@
 // though they are not in the current.txt files.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -84,7 +85,7 @@ java_library {
 java_defaults {
    name: "lib_mockito_extended",
    static_libs: [
-        "mockito-target-extended-minus-junit4"
+        "mockito-target-extended-minus-junit4",
    ],
    jni_libs: [
        "libdexmakerjvmtiagent",
--- a/staticlibs/client-libs/Android.bp
+++ b/staticlibs/client-libs/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -10,17 +11,17 @@ java_library {
    apex_available: [
        "//apex_available:platform",
        "com.android.tethering",
-        "com.android.wifi"
+        "com.android.wifi",
    ],
    visibility: [
        "//packages/modules/Connectivity:__subpackages__",
        "//frameworks/base/services:__subpackages__",
        "//frameworks/base/packages:__subpackages__",
-        "//packages/modules/Wifi/service:__subpackages__"
+        "//packages/modules/Wifi/service:__subpackages__",
    ],
    libs: ["androidx.annotation_annotation"],
    static_libs: [
        "netd_aidl_interface-lateststable-java",
-        "netd_event_listener_interface-lateststable-java"
-    ]
+        "netd_event_listener_interface-lateststable-java",
+    ],
 }
--- a/staticlibs/client-libs/tests/unit/Android.bp
+++ b/staticlibs/client-libs/tests/unit/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -26,7 +27,7 @@ android_library {
        "//packages/modules/Connectivity/tests:__subpackages__",
        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
        "//packages/modules/NetworkStack/tests/integration",
-    ]
+    ],
 }

 android_test {
--- a/staticlibs/native/bpf_headers/Android.bp
+++ b/staticlibs/native/bpf_headers/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/bpf_syscall_wrappers/Android.bp
+++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/bpfmapjni/Android.bp
+++ b/staticlibs/native/bpfmapjni/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/bpfutiljni/Android.bp
+++ b/staticlibs/native/bpfutiljni/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/ip_checksum/Android.bp
+++ b/staticlibs/native/ip_checksum/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/netjniutils/Android.bp
+++ b/staticlibs/native/netjniutils/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/nettestutils/Android.bp
+++ b/staticlibs/native/nettestutils/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/native/tcutils/Android.bp
+++ b/staticlibs/native/tcutils/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/netd/Android.bp
+++ b/staticlibs/netd/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/staticlibs/netd/libnetdutils/Android.bp
+++ b/staticlibs/netd/libnetdutils/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -22,7 +23,10 @@ cc_library {
        "Utils.cpp",
    ],
    defaults: ["netd_defaults"],
-    cflags: ["-Wall", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
    shared_libs: [
        "libbase",
        "liblog",
--- a/staticlibs/tests/unit/Android.bp
+++ b/staticlibs/tests/unit/Android.bp
@ -3,12 +3,16 @@
 //########################################################################

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

 android_library {
    name: "NetworkStaticLibTestsLib",
-    srcs: ["src/**/*.java","src/**/*.kt"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
    min_sdk_version: "30",
    defaults: ["framework-connectivity-test-defaults"],
    static_libs: [
@ -35,7 +39,7 @@ android_library {
    ],
    lint: {
        strict_updatability_linting: true,
-        test: true
+        test: true,
    },
 }

@ -52,5 +56,7 @@ android_test {
    ],
    jarjar_rules: "jarjar-rules.txt",
    test_suites: ["device-tests"],
-    lint: { strict_updatability_linting: true },
+    lint: {
+        strict_updatability_linting: true,
+    },
 }
--- a/staticlibs/testutils/Android.bp
+++ b/staticlibs/testutils/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -24,7 +25,7 @@ java_library {
    ],
    defaults: [
        "framework-connectivity-test-defaults",
-        "lib_mockito_extended"
+        "lib_mockito_extended",
    ],
    libs: [
        "androidx.annotation_annotation",
@ -42,7 +43,9 @@ java_library {
        "net-utils-device-common-wear",
        "modules-utils-build_system",
    ],
-    lint: { strict_updatability_linting: true },
+    lint: {
+        strict_updatability_linting: true,
+    },
 }

 java_library {
@ -72,9 +75,11 @@ java_library {
        "jsr305",
    ],
    static_libs: [
-        "kotlin-test"
+        "kotlin-test",
    ],
-    lint: { strict_updatability_linting: true },
+    lint: {
+        strict_updatability_linting: true,
+    },
 }

 java_test_host {
--- a/staticlibs/testutils/app/connectivitychecker/Android.bp
+++ b/staticlibs/testutils/app/connectivitychecker/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -30,5 +31,7 @@ android_test_helper_app {
        "net-tests-utils",
    ],
    host_required: ["net-tests-utils-host-common"],
-    lint: { strict_updatability_linting: true },
+    lint: {
+        strict_updatability_linting: true,
+    },
 }
--- a/tests/benchmark/Android.bp
+++ b/tests/benchmark/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
@ -40,4 +41,3 @@ android_test {
    test_suites: ["device-tests"],
    jarjar_rules: ":connectivity-jarjar-rules",
 }
-
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@ -17,6 +17,7 @@
 // Tests in this folder are included both in unit tests and CTS.
 // They must be fast and stable, and exercise public or test APIs.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
@ -93,7 +94,10 @@ android_test {
    name: "ConnectivityCoverageTests",
    // Tethering started on SDK 30
    min_sdk_version: "30",
-    test_suites: ["general-tests", "mts-tethering"],
+    test_suites: [
+        "general-tests",
+        "mts-tethering",
+    ],
    defaults: [
        "ConnectivityTestsLatestSdkDefaults",
        "framework-connectivity-internal-test-defaults",
--- a/tests/cts/hostside/Android.bp
+++ b/tests/cts/hostside/Android.bp
@ -23,6 +23,7 @@ next_app_data = []


 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -45,7 +46,7 @@ java_test_host {
        "general-tests",
        "mcts-tethering",
        "mts-tethering",
-        "sts"
+        "sts",
    ],
    data: [
        ":CtsHostsideNetworkTestsApp",
--- a/tests/cts/hostside/aidl/Android.bp
+++ b/tests/cts/hostside/aidl/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/hostside/app/Android.bp
+++ b/tests/cts/hostside/app/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/hostside/app2/Android.bp
+++ b/tests/cts/hostside/app2/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/hostside/certs/Android.bp
+++ b/tests/cts/hostside/certs/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/hostside/networkslicingtestapp/Android.bp
+++ b/tests/cts/hostside/networkslicingtestapp/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -40,7 +41,7 @@ android_test_helper_app {
    name: "CtsHostsideNetworkCapTestsAppWithoutProperty",
    defaults: [
        "cts_support_defaults",
-           "CtsHostsideNetworkCapTestsAppDefaults"
+        "CtsHostsideNetworkCapTestsAppDefaults",
    ],
    manifest: "AndroidManifestWithoutProperty.xml",
 }
@ -49,7 +50,7 @@ android_test_helper_app {
    name: "CtsHostsideNetworkCapTestsAppWithProperty",
    defaults: [
        "cts_support_defaults",
-           "CtsHostsideNetworkCapTestsAppDefaults"
+        "CtsHostsideNetworkCapTestsAppDefaults",
    ],
    manifest: "AndroidManifestWithProperty.xml",
 }
@ -58,7 +59,7 @@ android_test_helper_app {
    name: "CtsHostsideNetworkCapTestsAppSdk33",
    defaults: [
        "cts_support_defaults",
-           "CtsHostsideNetworkCapTestsAppDefaults"
+        "CtsHostsideNetworkCapTestsAppDefaults",
    ],
    target_sdk_version: "33",
    manifest: "AndroidManifestWithoutProperty.xml",
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -69,7 +70,7 @@ java_defaults {
    data: [
        ":ConnectivityTestPreparer",
        ":CtsCarrierServicePackage",
-    ]
+    ],
 }

 // Networking CTS tests for development and release. These tests always target the platform SDK
--- a/tests/cts/net/api23Test/Android.bp
+++ b/tests/cts/net/api23Test/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/net/appForApi23/Android.bp
+++ b/tests/cts/net/appForApi23/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/net/jni/Android.bp
+++ b/tests/cts/net/jni/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/net/native/Android.bp
+++ b/tests/cts/net/native/Android.bp
@ -15,6 +15,7 @@
 // Build the unit tests.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/net/native/dns/Android.bp
+++ b/tests/cts/net/native/dns/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/net/util/Android.bp
+++ b/tests/cts/net/util/Android.bp
@ -16,12 +16,16 @@

 // Common utilities for cts net tests.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

 java_library {
    name: "cts-net-utils",
-    srcs: ["java/**/*.java", "java/**/*.kt"],
+    srcs: [
+        "java/**/*.java",
+        "java/**/*.kt",
+    ],
    static_libs: [
        "compatibility-device-util-axt",
        "junit",
--- a/tests/cts/netpermission/internetpermission/Android.bp
+++ b/tests/cts/netpermission/internetpermission/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/netpermission/updatestatspermission/Android.bp
+++ b/tests/cts/netpermission/updatestatspermission/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/cts/tethering/Android.bp
+++ b/tests/cts/tethering/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/deflake/Android.bp
+++ b/tests/deflake/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
@ -74,7 +75,10 @@ android_test {
 java_library {
    name: "frameworks-net-integration-testutils",
    defaults: ["framework-connectivity-test-defaults"],
-    srcs: ["util/**/*.java", "util/**/*.kt"],
+    srcs: [
+        "util/**/*.java",
+        "util/**/*.kt",
+    ],
    static_libs: [
        "androidx.annotation_annotation",
        "androidx.test.rules",
--- a/tests/mts/Android.bp
+++ b/tests/mts/Android.bp
@ -14,6 +14,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/native/connectivity_native_test/Android.bp
+++ b/tests/native/connectivity_native_test/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tests/native/utilities/Android.bp
+++ b/tests/native/utilities/Android.bp
@ -14,6 +14,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_core_networking",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

@ -21,7 +22,7 @@ cc_test_library {
    name: "libconnectivity_native_test_utils",
    defaults: [
        "netd_defaults",
-        "resolv_test_defaults"
+        "resolv_test_defaults",
    ],
    srcs: [
        "firewall.cpp",
--- a/tests/smoketest/Android.bp
+++ b/tests/smoketest/Android.bp
@ -10,6 +10,7 @@
 // TODO: remove this hack when there is a better solution for jni_libs that includes
 // dependent libraries.
 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@ -2,6 +2,7 @@
 // Build FrameworksNetTests package
 //########################################################################
 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "Android-Apache-2.0"
@ -73,7 +74,7 @@ filegroup {
        "java/com/android/server/connectivity/NetdEventListenerServiceTest.java",
        "java/com/android/server/connectivity/VpnTest.java",
        "java/com/android/server/net/ipmemorystore/*.java",
-    ]
+    ],
 }

 // Subset of services-core used to by ConnectivityService tests to test VPN realistically.
@ -115,7 +116,7 @@ java_defaults {
        "service-connectivity-tiramisu-pre-jarjar",
        "services.core-vpn",
        "testables",
-        "cts-net-utils"
+        "cts-net-utils",
    ],
    libs: [
        "android.net.ipsec.ike.stubs.module_lib",
--- a/tests/unit/jni/Android.bp
+++ b/tests/unit/jni/Android.bp
@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }
--- a/thread/apex/Android.bp
+++ b/thread/apex/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/thread/demoapp/Android.bp
+++ b/thread/demoapp/Android.bp
@ -13,6 +13,7 @@
 // limitations under the License.

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/thread/framework/Android.bp
+++ b/thread/framework/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/thread/service/Android.bp
+++ b/thread/service/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/thread/tests/cts/Android.bp
+++ b/thread/tests/cts/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/thread/tests/integration/Android.bp
+++ b/thread/tests/integration/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/thread/tests/unit/Android.bp
+++ b/thread/tests/unit/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_thread_network",
    default_applicable_licenses: ["Android-Apache-2.0"],
 }

--- a/tools/Android.bp
+++ b/tools/Android.bp
@ -15,6 +15,7 @@
 //

 package {
+    default_team: "trendy_team_fwk_core_networking",
    // See: http://go/android-license-faq
    default_applicable_licenses: ["Android-Apache-2.0"],
 }