diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-05-22 11:02:12 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-05-22 11:02:12 +0900 |
| commit | 82d28e02d437efa25b4764a44b4dae67bb9c2868 (patch) | |
| tree | 12c13762478a3f91881510ab890b21af54b0f3be | |
| parent | 0a51e93a9b9493d23e18426bd0e31f15d15fb8a6 (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
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | packages/NetworkStack/Android.bp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7c21875d685f..f311fc81fc10 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -252,6 +252,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerService) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** 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 |