commit ae27901118d76db281f38c9d2c57749f4bbfea4b
author Motomu Utsumi <motomuman@google.com> Wed Apr 20 08:30:24 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Wed Jun 01 02:55:22 2022 +0000
tree d3a343286632d2ead8108e7e7a90382e3c224fec
parent 913b20ba5fbddf2636c4700930cf75cf0a91d59e

Remove NetworkPermissionConfig package

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

Bug: 223649084
Test: m

(cherry picked from f2bf0335cd98fd1f9666e4aad82b0cb9efeda8da)
Merged-In: I7d0565d366892f18dfc510ccbbdbf1eab6f1932a
Merged-In: I1bb172919db1368e1b0a6560d63dc9e35686f89e

Change-Id: I2f8ac1a31b053803bf1b46b4cfcfbf297b8ebec3

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 026ed54..8ab6507 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -179,9 +179,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"],
@@ -199,9 +199,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"],