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

Commit 170f8131 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Merge 'goog/rvc-dev-plus-aosp' into mainline-prod 

Test: m && m NetworkStack NetworkStackCoverageTests
Bug: 166414751
Change-Id: I28ee7cb66116d680c356f4eaf546f231a6b0bc25
parents 5f1a43b3 5e2983c1

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ java_defaults { 
    libs: ["unsupportedappusage"],

    static_libs: [

        "androidx.annotation_annotation",

        "netd_aidl_interface-java",

        "netd_aidl_interface-unstable-java",

        "netlink-client",

        "networkstack-client",

        "net-utils-framework-common",
@@ -95,6 +95,7 @@ java_defaults { 
        "datastallprotosnano",

        "statsprotos",

        "captiveportal-lib",

        "net-utils-device-common",

    ],

    plugins: ["java_api_finder"],

}

AndroidManifest.xml

+13 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <!-- Permissions must be defined here, and not in the base manifest, as the network stack

         running in the system server process does not need any permission, and having privileged

         permissions added would cause crashes on startup unless they are also added to the

         privileged permissions whitelist for that package. -->

         privileged permissions allowlist for that package. -->

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

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

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -44,11 +44,23 @@ 
        android:persistent="true"

        android:process="com.android.networkstack.process">

        <service android:name="com.android.server.NetworkStackService"

                 android:exported="true"

                 android:permission="android.permission.MAINLINE_NETWORK_STACK">

            <intent-filter>

                <action android:name="android.net.INetworkStackConnector"/>

            </intent-filter>

        </service>

        <!-- Test instrumentation service, only usable on debuggable builds.

             The service is protected by NETWORK_SETTINGS permissions as there is no better

             networking-related permission that exists on Q, is sufficiently protected (signature),

             and can be obtained via shell permissions. -->

        <service android:name="com.android.server.TestNetworkStackService"

                 android:permission="android.permission.NETWORK_SETTINGS"

                 android:exported="true">

            <intent-filter>

                <action android:name="android.net.INetworkStackConnector.Test"/>

            </intent-filter>

        </service>

        <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"

                 android:permission="android.permission.BIND_JOB_SERVICE" >

        </service>

AndroidManifest_InProcess.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    <application>

        <service android:name="com.android.server.NetworkStackService"

                 android:process="system"

                 android:exported="true"

                 android:permission="android.permission.MAINLINE_NETWORK_STACK">

            <intent-filter>

                <action android:name="android.net.INetworkStackConnector.InProcess"/>

common/captiveportal/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -21,4 +21,6 @@ java_library { 
        "androidx.annotation_annotation",

    ],

    sdk_version: "system_current",

    // this is part of updatable modules(NetworkStack) which targets 29(Q)

    min_sdk_version: "29",

}
 
 No newline at end of file

common/moduleutils/Android.bp

+1 −15
Original line number Diff line number Diff line
@@ -56,22 +56,8 @@ filegroup { 
        "src/android/net/netlink/*.java",

        "src/android/net/shared/NetdUtils.java",

        "src/android/net/shared/RouteUtils.java",

        "src/android/net/util/FdEventsReader.java",

        "src/android/net/util/InterfaceParams.java",

        "src/android/net/util/PacketReader.java",

        "src/android/net/util/SharedLog.java"

        "src/android/net/util/SharedLog.java",

    ],

    visibility: ["//frameworks/base/packages/Tethering"],

}
 


// Utility sources used by test libraries.

// This is its own group to limit indiscriminate dependency of test code on production code.

// TODO: move these classes and NetworkStack/tests/lib to frameworks/libs/net, and remove this.

filegroup {

    name: "net-module-utils-srcs-for-tests",

    visibility: ["//packages/modules/NetworkStack/tests/lib"],

    srcs: [

        "src/android/net/util/FdEventsReader.java",

        "src/android/net/util/PacketReader.java",

    ],

}