summaryrefslogtreecommitdiff
path: root/packages/NetworkStack
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-05-22 05:25:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 05:25:14 +0000
commit0bb09184ff05ae078357cded64ddd6b0c8dfe79d (patch)
treed6d7a96cd21f9e6a482fea7f707e6ca85332f25d /packages/NetworkStack
parentb3c874492fdc8db9a5bf31c1ce16ea3726034832 (diff)
parent82d28e02d437efa25b4764a44b4dae67bb9c2868 (diff)
Merge "InProcessNetworkStack requires platform-signed APK" into qt-dev
Diffstat (limited to 'packages/NetworkStack')
-rw-r--r--packages/NetworkStack/Android.bp4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp
index e15526a571f5..aefa882f0ce8 100644
--- a/packages/NetworkStack/Android.bp
+++ b/packages/NetworkStack/Android.bp
@@ -109,7 +109,9 @@ android_app {
// InProcessNetworkStack is a replacement for NetworkStack
overrides: ["NetworkStack"],
// The permission configuration *must* be included to ensure security of the device
- required: ["PlatformNetworkPermissionConfig"],
+ // The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces
+ // the default CaptivePortalLogin.
+ required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],
}
// Updatable network stack packaged as an application