diff options
| author | 2020-07-23 10:15:01 +0000 | |
|---|---|---|
| committer | 2020-07-23 10:15:01 +0000 | |
| commit | feefc87df860f5c182be6bb2f05da38d777e5775 (patch) | |
| tree | 6e10aa98d13f03bbdaecb3dc6b5f028eadb2e666 | |
| parent | 1488c200b92a247d2536cbfd4404ebefa6effb39 (diff) | |
| parent | 0399bc3f1a16a213c8216486bf12137f66c3a225 (diff) | |
Merge "Update language to comply with Android’s inclusive language guidance" am: c4a477881e am: bcf2bc7a1d am: 2f23d6e220 am: 0399bc3f1a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1369877
Change-Id: I0070051bb3c4b4537827b7213ba1b5a562b4adad
| -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 ef2781082a24..e2acbd512819 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java @@ -227,7 +227,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 |