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

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

Merge "Use more inclusive language for #inclusivefixit" am: c35d9502 am:... 

Merge "Use more inclusive language for #inclusivefixit" am: c35d9502 am: fe047a33 am: 516a58a8

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

Change-Id: I0890c021a875106385a9bbf772a0e510ea175d1d
parents 0f15cb0d 516a58a8

AndroidManifest.xml

+1 −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" />

src/android/net/apf/ApfFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ public class ApfFilter { 
            mPacket = ByteBuffer.wrap(Arrays.copyOf(packet, length));

            mLastSeen = currentTimeSeconds();



            // Sanity check packet in case a packet arrives before we attach RA filter

            // Check packet in case a packet arrives before we attach RA filter

            // to our packet socket. b/29586253

            if (getUint16(mPacket, ETH_ETHERTYPE_OFFSET) != ETH_P_IPV6 ||

                    getUint8(mPacket, IPV6_NEXT_HEADER_OFFSET) != IPPROTO_ICMPV6 ||

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ public class IpClientIntegrationTest { 
        assertNotNull(params.macAddr);

        assertTrue(params.hasMacAddress);



        // Sanity check.

        //  Check interface "lo".

        params = InterfaceParams.getByName("lo");

        assertNotNull(params);

        assertEquals("lo", params.name);