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

Commit 31d3a7d5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7716385 from e59d0c3d to mainline-tethering-release 

Change-Id: Ied684ec54d58ed797e4a8ae5ca376a2e84de751c
parents 2cda2f4b e59d0c3d

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
  android:sharedUserId="android.uid.networkstack"

  android:versionCode="319999900"

  android:versionName="s_aml_319999900"

  coreApp="true"

>

    <!-- 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

AndroidManifest_InProcess.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.networkstack.inprocess"

          android:sharedUserId="android.uid.system"

          android:process="system">

          android:process="system"

          coreApp="true">

    <application>

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

                 android:process="system"

AndroidManifest_Next.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ 
          package="com.android.networkstack"

          android:sharedUserId="android.uid.networkstack"

          android:versionCode="320000000"

          android:versionName="T-next">

          android:versionName="T-next"

          coreApp="true">

</manifest>

TEST_MAPPING

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ 
    // We must specify at least one module here or the tests won't run. Use the same set as CTS

    // so in theory the infra would not need to reinstall/reboot devices to run both.

    {

      // TODO: add back tethering when it is updatable in this branch

      "name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]"

      "name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"

    }

  ],

  "mainline-postsubmit": [

src/android/net/ip/IpClient.java

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ public class IpClient extends StateMachine { 
                (ifaceUp) -> sendMessage(EVENT_NETLINK_LINKPROPERTIES_CHANGED, ifaceUp

                        ? ARG_LINKPROP_CHANGED_LINKSTATE_UP

                        : ARG_LINKPROP_CHANGED_LINKSTATE_DOWN),

                config, mLog) {

                config, mLog, mDependencies) {

            @Override

            public void onInterfaceAdded(String iface) {

                super.onInterfaceAdded(iface);