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

am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev

Browse Source 
* commit '9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
  CEC: Discard key event to itself
This commit is contained in:
Jinsuk Kim
2015-01-29 22:39:57 +00:00
committed by Android Git Automerger
parent eb2c4a07a1 9c5ccc3684
commit 7bf039b67c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -432,11 +432,15 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
return; return;
} }
List<SendKeyAction> action = getActions(SendKeyAction.class); List<SendKeyAction> action = getActions(SendKeyAction.class);
int logicalAddress = findKeyReceiverAddress();
if (logicalAddress == mAddress) {
Slog.w(TAG, "Discard key event to itself :" + keyCode + " pressed:" + isPressed);
return;
}
if (!action.isEmpty()) { if (!action.isEmpty()) {
action.get(0).processKeyEvent(keyCode, isPressed); action.get(0).processKeyEvent(keyCode, isPressed);
} else { } else {
if (isPressed) { if (isPressed) {
int logicalAddress = findKeyReceiverAddress();
if (logicalAddress != Constants.ADDR_INVALID) { if (logicalAddress != Constants.ADDR_INVALID) {
addAndStartAction(new SendKeyAction(this, logicalAddress, keyCode)); addAndStartAction(new SendKeyAction(this, logicalAddress, keyCode));
return; return;