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

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

Merge "Sign networkstack with its own certificate" am: fd2d7dc6 

am: 0c587259

Change-Id: I1cca500ca0c65ae04d0e1b99e04a15f5e11853c1
parents f309a828 0c587259

packages/CaptivePortalLogin/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ android_app { 
    name: "CaptivePortalLogin",

    srcs: ["src/**/*.java"],

    sdk_version: "system_current",

    certificate: "platform",

    certificate: "networkstack",

    static_libs: [

        "android-support-v4",

        "metrics-constants-protos",

packages/CaptivePortalLogin/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />

    <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" />

    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />



    <application android:label="@string/app_name"

                 android:usesCleartextTraffic="true"

packages/NetworkStack/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ java_library { 
android_app {

    name: "NetworkStack",

    sdk_version: "system_current",

    certificate: "platform",

    certificate: "networkstack",

    privileged: true,

    static_libs: [

        "NetworkStackLib"

packages/NetworkStack/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -24,12 +24,10 @@ 
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />

    <!-- Signature permission defined in NetworkStackStub -->

    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />

    <!-- Send latency broadcast as current user -->

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.NETWORK_STACK" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    <application

packages/NetworkStackPermissionStub/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ android_app { 
    // a classes.dex.

    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

    certificate: "networkstack",

    privileged: true,

    manifest: "AndroidManifest.xml",

}