Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82d28e02 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

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
parent 0a51e93a

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

# ******************************************************************

packages/NetworkStack/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -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