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

Commit cb7d6cfc authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "InProcessNetworkStack requires platform-signed APK" into qt-dev am:... 

Merge "InProcessNetworkStack requires platform-signed APK" into qt-dev am: 0bb09184 am: fea3232c
am: 6d45c7d0

Change-Id: I53e08a74ed86941782a0e656f68538d367ae2c19
parents 6d268aec 6d45c7d0

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