Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic4d4a00d3c54e1523af6b6c81af3b017f8565d8f
This commit is contained in:
Treehugger Robot
2020-07-23 09:32:14 +00:00
committed by Automerger Merge Worker
parent 8ac7d59373 c4a477881e
commit bcf2bc7a1d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
View File

@@ -241,7 +241,7 @@ abstract class HdmiCecLocalDevice {
if (dest != mAddress && dest != Constants.ADDR_BROADCAST) { if (dest != mAddress && dest != Constants.ADDR_BROADCAST) {
return false; 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); mCecMessageCache.cacheMessage(message);
return onMessage(message); return onMessage(message);
} }

2
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
View File

@@ -201,7 +201,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
if (SystemProperties.getBoolean(Constants.PROPERTY_KEEP_AWAKE, true)) { if (SystemProperties.getBoolean(Constants.PROPERTY_KEEP_AWAKE, true)) {
mWakeLock = new SystemWakeLock(); mWakeLock = new SystemWakeLock();
} else { } 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. // hence allows the device to go to sleep even if it's the active source.
mWakeLock = new ActiveWakeLock() { mWakeLock = new ActiveWakeLock() {
@Override @Override