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

Commit e4a10657 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 am: b541f147

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

Change-Id: Id57024f1f056fd219c206235b1b1431a8e07c710
parents 0623c9d3 b541f147

AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <!-- Permissions must be defined here, and not in the base manifest, as the network stack

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

         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

         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.INTERNET" />

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

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

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

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

src/android/net/apf/ApfFilter.java

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

            mPacket = ByteBuffer.wrap(Arrays.copyOf(packet, length));

            mLastSeen = currentTimeSeconds();

            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

            // to our packet socket. b/29586253

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

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

                    getUint8(mPacket, IPV6_NEXT_HEADER_OFFSET) != IPPROTO_ICMPV6 ||

                    getUint8(mPacket, IPV6_NEXT_HEADER_OFFSET) != IPPROTO_ICMPV6 ||

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

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

        assertNotNull(params.macAddr);

        assertTrue(params.hasMacAddress);

        assertTrue(params.hasMacAddress);





        // Sanity check.

        //  Check interface "lo".

        params = InterfaceParams.getByName("lo");

        params = InterfaceParams.getByName("lo");

        assertNotNull(params);

        assertNotNull(params);

        assertEquals("lo", params.name);

        assertEquals("lo", params.name);