commit f2bf0335cd98fd1f9666e4aad82b0cb9efeda8da
author Motomu Utsumi <motomuman@google.com> Wed Apr 20 08:30:24 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Sat Apr 23 04:35:24 2022 +0000
tree cb636aef62045e3d4f9310dc268b9c3928fcb6b1
parent febcedef5a7cc21e14ec99147e5062f2897566cd

Remove NetworkPermissionConfig package

Move declaration of MAINLINE_NETWORK_STACK permission from the
NetworkPermissionConfig package to the NetworkStack package.

Bug: 223649084
Test: m
Ignore-AOSP-First: changes in topics contains internal-only projects
Change-Id: I7d0565d366892f18dfc510ccbbdbf1eab6f1932a

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 29f6e12..1728665 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -178,9 +178,9 @@
     certificate: "networkstack",
     manifest: "AndroidManifest.xml",
     use_embedded_native_libs: true,
-    // The permission configuration *must* be included to ensure security of the device
+    // The network stack *must* be included to ensure security of the device
     required: [
-        "NetworkPermissionConfig",
+        "NetworkStack",
         "privapp_allowlist_com.android.tethering",
     ],
     apex_available: ["com.android.tethering"],
@@ -198,9 +198,9 @@
     certificate: "networkstack",
     manifest: "AndroidManifest.xml",
     use_embedded_native_libs: true,
-    // The permission configuration *must* be included to ensure security of the device
+    // The network stack *must* be included to ensure security of the device
     required: [
-        "NetworkPermissionConfig",
+        "NetworkStackNext",
         "privapp_allowlist_com.android.tethering",
     ],
     apex_available: ["com.android.tethering"],