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

Commit d9f6dde0 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: f4c6a534 am: 127c4fc7 am: 42630234 am: 308bbb6a

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

Change-Id: I0d07872b37c6b77a809b34f61f84cc81cfb2da90
parents d99c1a09 308bbb6a

res/values-mcc460/config.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <!-- Network validation URL configuration for devices using a Chinese SIM (MCC 460).

         The below URLs are often whitelisted by captive portals, so they should not be used in the

         The below URLs are often allowed by captive portals, so they should not be used in the

         general case as this could degrade the user experience (portals not detected properly).

         However in China the default URLs are not accessible in general. The below alternatives

         should allow users to connect to local networks normally. -->

tests/integration/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
         to the network stack app. Otherwise, the test APK will install, but when the device is

         rebooted, it will bootloop with something like:



         05-14 00:41:02.723 18330 18330 E AndroidRuntime: java.lang.IllegalStateException: Signature|privileged permissions not in privapp-permissions whitelist: {com.android.server.networkstack.integrationtests: android.permission.CONNECTIVITY_INTERNAL}

         05-14 00:41:02.723 18330 18330 E AndroidRuntime: java.lang.IllegalStateException: Signature|privileged permissions not in privapp-permissions allowlist: {com.android.server.networkstack.integrationtests: android.permission.CONNECTIVITY_INTERNAL}

    -->



    <application android:debuggable="true">

tests/integration/AndroidManifest_coverage.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
         to the network stack app. Otherwise, the test APK will install, but when the device is

         rebooted, it will bootloop with something like:



         05-14 00:41:02.723 18330 18330 E AndroidRuntime: java.lang.IllegalStateException: Signature|privileged permissions not in privapp-permissions whitelist: {com.android.server.networkstack.integrationtests: android.permission.CONNECTIVITY_INTERNAL}

         05-14 00:41:02.723 18330 18330 E AndroidRuntime: java.lang.IllegalStateException: Signature|privileged permissions not in privapp-permissions allowlist: {com.android.server.networkstack.integrationtests: android.permission.CONNECTIVITY_INTERNAL}

    -->

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