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

Commit c4a47788 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update language to comply with Android’s inclusive language guidance"

parents af04506e 0bb72bdf

services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ abstract class HdmiCecLocalDevice { 
        if (dest != mAddress && dest != Constants.ADDR_BROADCAST) {

            return false;

        }

        // Cache incoming message. Note that it caches only white-listed one.

        // Cache incoming message if it is included in the list of cacheable opcodes.

        mCecMessageCache.cacheMessage(message);

        return onMessage(message);

    }

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
            if (SystemProperties.getBoolean(Constants.PROPERTY_KEEP_AWAKE, true)) {

                mWakeLock = new SystemWakeLock();

            } else {

                // Create a dummy lock object that doesn't do anything about wake lock,

                // Create a stub lock object that doesn't do anything about wake lock,

                // hence allows the device to go to sleep even if it's the active source.

                mWakeLock = new ActiveWakeLock() {

                    @Override