Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840

Change-Id: I39d4edd4511d1677af0415d57123f88e5705c3dc

Android.bp

@@ -581,6 +581,7 @@ java_library {
         "//frameworks/base/apex/blobstore/framework",
         "//frameworks/base/apex/jobscheduler/framework",
         "//frameworks/base/packages/Tethering/tests/unit",
+        "//packages/modules/Connectivity/Tethering/tests/unit",
     ],
 }
 

core/java/android/net/TEST_MAPPING

@@ -17,4 +17,4 @@
       "path": "frameworks/opt/net/wifi"
     }
   ]
-}
+}

packages/Tethering/OWNERS

@@ -1,2 +1,2 @@
-include platform/packages/modules/NetworkStack/:/OWNERS
-markchien@google.com
+set noparent # while performing migration - b/167962976
+baligh@google.com

packages/Tethering/common/TetheringLib/Android.bp

@@ -16,7 +16,10 @@
 java_sdk_library {
     name: "framework-tethering",
     defaults: ["framework-module-defaults"],
-    impl_library_visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
+    impl_library_visibility: [
+        "//frameworks/base/packages/Tethering:__subpackages__",
+        "//packages/modules/Connectivity/Tethering:__subpackages__",
+    ],
 
     srcs: [":framework-tethering-srcs"],
 

packages/Tethering/tests/Android.bp

@@ -19,5 +19,6 @@ filegroup {
     srcs: ["jarjar-rules.txt"],
     visibility: [
         "//frameworks/base/packages/Tethering/tests:__subpackages__",
+        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
     ]
 }

packages/Tethering/tests/unit/Android.bp

@@ -77,6 +77,7 @@ android_library {
     defaults: ["TetheringTestsDefaults"],
     visibility: [
         "//frameworks/base/packages/Tethering/tests/integration",
+        "//packages/modules/Connectivity/Tethering/tests/integration",
     ]
 }
 

services/net/Android.bp

@@ -66,5 +66,8 @@ filegroup {
         ":framework-annotations",
         "java/android/net/util/NetworkConstants.java",
     ],
-    visibility: ["//frameworks/base/packages/Tethering"],
+    visibility: [
+        "//frameworks/base/packages/Tethering",
+        "//packages/modules/Connectivity/Tethering"
+    ],
 }