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

Commit ebb7839e authored by Hongguang Chen's avatar Hongguang Chen
Browse files

Use more inclusive language for #inclusivefixit 

Updating language to comply with Android’s inclusive language guidance.

See https://source.android.com/setup/contribute/respectful-code for reference.

Bug: 161896447
Test: make
Change-Id: Ib413472abf3656e49a6103f834e007e4590e6ab9
parent 68d4975b

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
@@ -1013,7 +1013,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);