drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Invoke the callback only when DeviceInfo is available." into lmp-dev

Browse Source
This commit is contained in:
Yuncheol Heo
2014-09-03 22:41:40 +00:00
committed by Android (Google) Code Review
parent 628025335a 7c5d31ea93
commit aa6a67a3e1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -856,8 +856,11 @@ public final class HdmiControlService extends SystemService {
device.onDeviceRemoved();
// There is no explicit event for device removal unlike capability register event
// used for device addition . Hence we remove the device on hotplug event.
invokeDeviceEventListeners(device.getInfo(), DEVICE_EVENT_REMOVE_DEVICE);
updateSafeMhlInput();
HdmiDeviceInfo deviceInfo = device.getInfo();
if (deviceInfo != null) {
invokeDeviceEventListeners(deviceInfo, DEVICE_EVENT_REMOVE_DEVICE);
updateSafeMhlInput();
}
} else {
Slog.w(TAG, "No device to remove:[portId=" + portId);
}
@ -1082,7 +1085,7 @@ public final class HdmiControlService extends SystemService {
// the connected mobile device, start routing control to switch ports.
// callback is handled by MHL action.
device.turnOn(callback);
tv.doManualPortSwitching(device.getInfo().getPortId(), null);
tv.doManualPortSwitching(device.getPortId(), null);
return;
}
tv.deviceSelect(deviceId, callback);