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

Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev

Browse Source
This commit is contained in:
Jungshik Jang
2014-08-20 01:19:12 +00:00
committed by Android (Google) Code Review
parent 2738e2d872 350e68d0b8
commit 5ba6906768
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,7 +356,7 @@ public final class HdmiControlService extends SystemService {
break;
case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED:
tv().setAutoWakeup(enabled);
setOption(OPTION_CEC_AUTO_WAKEUP, toInt(enabled));
setCecOption(OPTION_CEC_AUTO_WAKEUP, toInt(enabled));
break;
case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:
tv().setAutoDeviceOff(enabled);
@@ -1687,11 +1687,17 @@ public final class HdmiControlService extends SystemService {
}
private void disableDevices(PendingActionClearedCallback callback) {
for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
device.disableDevice(mStandbyMessageReceived, callback);
if (mCecController != null) {
for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
device.disableDevice(mStandbyMessageReceived, callback);
}
if (isTvDevice()) {
unregisterSettingsObserver();
}
}
if (isTvDevice()) {
unregisterSettingsObserver();
if (mMhlController != null) {
mMhlController.clearAllLocalDevices();
}
}
@@ -1763,7 +1769,7 @@ public final class HdmiControlService extends SystemService {
}
@ServiceThreadOnly
void setOption(int key, int value) {
void setCecOption(int key, int value) {
assertRunOnServiceThread();
mCecController.setOption(key, value);
}