summaryrefslogtreecommitdiff
path: root/packages/NetworkStack
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-05-22 11:02:12 +0900
committerRemi NGUYEN VAN <reminv@google.com>2019-05-22 11:02:12 +0900
commit82d28e02d437efa25b4764a44b4dae67bb9c2868 (patch)
tree12c13762478a3f91881510ab890b21af54b0f3be /packages/NetworkStack
parent0a51e93a9b9493d23e18426bd0e31f15d15fb8a6 (diff)
InProcessNetworkStack requires platform-signed APK
PlatformCaptivePortalLogin must be used with InProcessNetworkStack instead of CaptivePortalLogin, since the signature of the APKs must match. Bug: 132666298 Test: Flashed walleye_svelte-eng, networking and captive portal working, including "use as-is". Change-Id: I243b29f2397b22f0d55af0d8927e75916d644198
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