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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1369877

Change-Id: Ic4d4a00d3c54e1523af6b6c81af3b017f8565d8f

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 78b091e436ac..1c84eefe8d4d 100755
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -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);
     }
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index 603dfafc6ff5..19f9715e2b5d 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -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