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

Commit ddffcd6b authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Add required permission to NetworkStack am: 187e948e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/14351736

Change-Id: Id3027418ce971b0a0b40d3e61588020d31c26ae7
parents 421f95c5 187e948e
Loading
Loading
Loading
Loading
+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