Add required permission to NetworkStack
The permission of NetworkStack is moved to a separate xml file,
add the xml module to the required field of networkstack app.
Bug: 151213404
Test: NetworkStackTests
Ignore-AOSP-First: merge conflict resolutions
Change-Id: I2e6f3f476fdac8efa0029c82a338c1d9781a5bdf
diff --git a/Android.bp b/Android.bp
index 76a1717..0b17b14 100644
--- a/Android.bp
+++ b/Android.bp
@@ -283,7 +283,10 @@
// The permission configuration *must* be included to ensure security of the device
// The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces
// the default CaptivePortalLogin.
- required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],
+ required: [
+ "PlatformNetworkPermissionConfig",
+ "PlatformCaptivePortalLogin",
+ ],
}
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -302,7 +305,10 @@
certificate: "networkstack",
manifest: "AndroidManifest_Next.xml",
// The permission configuration *must* be included to ensure security of the device
- required: ["NetworkPermissionConfig"],
+ required: [
+ "NetworkPermissionConfig",
+ "privapp_whitelist_com.android.networkstack",
+ ],
}
// Updatable network stack for finalized API
@@ -313,7 +319,10 @@
certificate: "networkstack",
manifest: "AndroidManifest.xml",
// The permission configuration *must* be included to ensure security of the device
- required: ["NetworkPermissionConfig"],
+ required: [
+ "NetworkPermissionConfig",
+ "privapp_whitelist_com.android.networkstack",
+ ],
updatable: true,
}
@@ -390,7 +399,10 @@
certificate: "networkstack",
manifest: ":NetworkStackTestAndroidManifest",
// The permission configuration *must* be included to ensure security of the device
- required: ["NetworkPermissionConfig"],
+ required: [
+ "NetworkPermissionConfig",
+ "privapp_whitelist_com.android.networkstack",
+ ],
}
// When adding or modifying protos, the jarjar rules and possibly proguard rules need