diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-29 06:50:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 06:50:45 +0000 |
| commit | b7f400038362ae9c8be3f324dfb5f3d87152d8ef (patch) | |
| tree | ce154e78a2515dd203d8bb08cb5072768b0f47a3 /services | |
| parent | 78c3a8ec42bb47ed7de09ed965c09723f1b4e264 (diff) | |
| parent | 7640d9895cf8fae7a99a7db5bba0079ba6022621 (diff) | |
| download | frameworks_base-b7f400038362ae9c8be3f324dfb5f3d87152d8ef.zip frameworks_base-b7f400038362ae9c8be3f324dfb5f3d87152d8ef.tar.gz frameworks_base-b7f400038362ae9c8be3f324dfb5f3d87152d8ef.tar.bz2 | |
am 7640d989: CEC: Fix a regression bug
* commit '7640d9895cf8fae7a99a7db5bba0079ba6022621':
CEC: Fix a regression bug
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 19 | ||||
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 43ef457..9373e43 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -1456,6 +1456,25 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { } /** + * Returns the {@link HdmiDeviceInfo} instance whose physical address matches + * the given routing path. This is the version accessible safely from threads + * other than service thread. + * + * @param path routing path or physical address + * @return {@link HdmiDeviceInfo} if the matched info is found; otherwise null + */ + HdmiDeviceInfo getSafeDeviceInfoByPath(int path) { + synchronized (mLock) { + for (HdmiDeviceInfo info : mSafeAllDeviceInfos) { + if (info.getPhysicalAddress() == path) { + return info; + } + } + return null; + } + } + + /** * Whether a device of the specified physical address and logical address exists * in a device info list. However, both are minimal condition and it could * be different device from the original one. diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 9f78c61..49a96d8 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -1196,7 +1196,7 @@ public final class HdmiControlService extends SystemService { } int activePath = tv.getActivePath(); if (activePath != HdmiDeviceInfo.PATH_INVALID) { - HdmiDeviceInfo info = tv.getDeviceInfoByPath(activePath); + HdmiDeviceInfo info = tv.getSafeDeviceInfoByPath(activePath); return (info != null) ? info : new HdmiDeviceInfo(activePath, tv.getActivePortId()); } return null; |