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

Commit 3b1002d9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7728678 from e292c8ed to mainline-ipsec-release 

Change-Id: I7f7d9a043c3a76bbdfbfef69d8395b22017a5c57
parents 40be9a9c e292c8ed

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": [

res/values-da/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <string name="notification_channel_name_connected" msgid="1795068343200033922">"Godkendelse til loginportal"</string>

    <string name="notification_channel_description_connected" msgid="7239184168268014518">"De notifikationer, der vises, når enheden er blevet godkendt til et netværk via en loginportal"</string>

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Oplysninger om netværksplacering"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notifikationer, der vises for at indikere, at netværket har en side med oplysninger om placeringen"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notifikationer, der vises for at indikere, at netværket har en side med oplysninger om lokationen"</string>

    <string name="connected" msgid="4563643884927480998">"Der er oprettet forbindelse"</string>

    <string name="tap_for_info" msgid="6849746325626883711">"Der er oprettet forbindelse/tryk for at se website"</string>

    <string name="application_label" msgid="1322847171305285454">"Netværksadministrator"</string>