diff options
| author | 2020-07-23 10:33:48 +0000 | |
|---|---|---|
| committer | 2020-07-23 10:33:48 +0000 | |
| commit | 132ef7e4d83696bb6595bea448b148cf8e82fb19 (patch) | |
| tree | fe31284e8607ce6446f91189efdc52db5df0db8d | |
| parent | c987165d86b865b1fcd06ec457cc7df903601aed (diff) | |
| parent | feefc87df860f5c182be6bb2f05da38d777e5775 (diff) | |
Merge "Update language to comply with Android’s inclusive language guidance" am: c4a477881e am: bcf2bc7a1d am: 2f23d6e220 am: 0399bc3f1a am: feefc87df8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1369877
Change-Id: Iee059588be13a18d116ee35421a0f458e771e76c
| -rwxr-xr-x | services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java index 3ff6ec1afa41..86e6a3220507 100755 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java @@ -244,7 +244,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); } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java index aed94fc85431..64d70d6601f6 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java @@ -225,7 +225,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 |