Merge "CEC: Prevent NPE on HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED change"

This commit is contained in:
Terry (Woncheol) Heo
2015-12-14 02:40:03 +00:00
committed by Android (Google) Code Review

View File

@@ -523,7 +523,9 @@ public final class HdmiControlService extends SystemService {
case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:
for (int type : mLocalDevices) {
HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type);
localDevice.setAutoDeviceOff(enabled);
if (localDevice != null) {
localDevice.setAutoDeviceOff(enabled);
}
}
// No need to propagate to HAL.
break;