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

Commit b0880fe6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Update language to comply with Android's inclusive language guidance"" am: 132f9500 am: 00e74cf5

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

Change-Id: I8bcf2ee77bad6742d1262b695aafaca8b45b5b39
parents 42630234 00e74cf5

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 allowed by captive portals, so they should not be used in the

         The below URLs are often whitelisted 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 allowlist: {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 whitelist: {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 allowlist: {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 whitelist: {com.android.server.networkstack.integrationtests: android.permission.CONNECTIVITY_INTERNAL}

    -->

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