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

Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2015-01-19 02:20:17 +00:00
committed by Android (Google) Code Review
parent d2dd69ae8d d47abefc82
commit bbfec56dfc
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,18 +222,13 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
} }
@Override @Override
@ServiceThreadOnly
protected int getPreferredAddress() { protected int getPreferredAddress() {
assertRunOnServiceThread(); return Constants.ADDR_TV;
return SystemProperties.getInt(Constants.PROPERTY_PREFERRED_ADDRESS_TV,
Constants.ADDR_UNREGISTERED);
} }
@Override @Override
@ServiceThreadOnly
protected void setPreferredAddress(int addr) { protected void setPreferredAddress(int addr) {
assertRunOnServiceThread(); Slog.w(TAG, "Preferred addres will not be stored for TV");
SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_TV, String.valueOf(addr));
} }
@Override @Override
@@ -1631,7 +1626,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
Slog.w(TAG, "Invalid record source." + Arrays.toString(recordSource)); Slog.w(TAG, "Invalid record source." + Arrays.toString(recordSource));
announceOneTouchRecordResult(recorderAddress, announceOneTouchRecordResult(recorderAddress,
ONE_TOUCH_RECORD_FAIL_TO_RECORD_DISPLAYED_SCREEN); ONE_TOUCH_RECORD_FAIL_TO_RECORD_DISPLAYED_SCREEN);
return Constants.ABORT_UNABLE_TO_DETERMINE; return Constants.ABORT_CANNOT_PROVIDE_SOURCE;
} }
addAndStartAction(new OneTouchRecordAction(this, recorderAddress, recordSource)); addAndStartAction(new OneTouchRecordAction(this, recorderAddress, recordSource));

3
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -1192,7 +1192,8 @@ public final class HdmiControlService extends SystemService {
} }
int activePath = tv.getActivePath(); int activePath = tv.getActivePath();
if (activePath != HdmiDeviceInfo.PATH_INVALID) { if (activePath != HdmiDeviceInfo.PATH_INVALID) {
return new HdmiDeviceInfo(activePath, tv.getActivePortId()); HdmiDeviceInfo info = tv.getDeviceInfoByPath(activePath);
return (info != null) ? info : new HdmiDeviceInfo(activePath, tv.getActivePortId());
} }
return null; return null;
} }