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

Commit 187e948e authored by Aaron Huang's avatar Aaron Huang
Browse files

Add required permission to NetworkStack 

The permission of NetworkStack is moved to a separate xml file,
add the xml module to the required field of networkstack app.

Bug: 151213404
Test: NetworkStackTests
Ignore-AOSP-First: merge conflict resolutions
Change-Id: I2e6f3f476fdac8efa0029c82a338c1d9781a5bdf
parent 518618bd

Android.bp

+16 −4
Original line number Diff line number Diff line
@@ -283,7 +283,10 @@ android_app { 
    // The permission configuration *must* be included to ensure security of the device

    // The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces

    // the default CaptivePortalLogin.

    required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],

    required: [

        "PlatformNetworkPermissionConfig",

        "PlatformCaptivePortalLogin",

    ],

}



// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -302,7 +305,10 @@ android_app { 
    certificate: "networkstack",

    manifest: "AndroidManifest_Next.xml",

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkPermissionConfig"],

    required: [

        "NetworkPermissionConfig",

        "privapp_whitelist_com.android.networkstack",

    ],

}



// Updatable network stack for finalized API
@@ -313,7 +319,10 @@ android_app { 
    certificate: "networkstack",

    manifest: "AndroidManifest.xml",

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkPermissionConfig"],

    required: [

        "NetworkPermissionConfig",

        "privapp_whitelist_com.android.networkstack",

    ],

    updatable: true,

}
@@ -390,7 +399,10 @@ android_app { 
    certificate: "networkstack",

    manifest: ":NetworkStackTestAndroidManifest",

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkPermissionConfig"],

    required: [

        "NetworkPermissionConfig",

        "privapp_whitelist_com.android.networkstack",

    ],

}



// When adding or modifying protos, the jarjar rules and possibly proguard rules need