Merge "Update local device info" into udc-dev (3e7b20e5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -682,7 +682,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		@ServiceThreadOnly
		private void launchDeviceDiscovery() {
		assertRunOnServiceThread();
		clearDeviceInfoList();
		DeviceDiscoveryAction action = new DeviceDiscoveryAction(this,
		new DeviceDiscoveryCallback() {
		@Override
		@@ -691,13 +690,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		mService.getHdmiCecNetwork().addCecDevice(info);
		}

		// Since we removed all devices when it starts and
		// device discovery action does not poll local devices,
		// we should put device info of local device manually here
		for (HdmiCecLocalDevice device : mService.getAllCecLocalDevices()) {
		mService.getHdmiCecNetwork().addCecDevice(device.getDeviceInfo());
		}

		mSelectRequestBuffer.process();
		resetSelectRequestBuffer();

+2 −0

Original line number	Diff line number	Diff line
		@@ -1267,6 +1267,7 @@ public class HdmiControlService extends SystemService {
		// It's now safe to flush existing local devices from mCecController since they were
		// already moved to 'localDevices'.
		clearCecLocalDevices();
		mHdmiCecNetwork.clearDeviceList();
		allocateLogicalAddress(localDevices, initiatedBy);
		}

		@@ -1303,6 +1304,7 @@ public class HdmiControlService extends SystemService {
		HdmiControlManager.POWER_STATUS_ON, getCecVersion());
		localDevice.setDeviceInfo(deviceInfo);
		mHdmiCecNetwork.addLocalDevice(deviceType, localDevice);
		mHdmiCecNetwork.addCecDevice(localDevice.getDeviceInfo());
		mCecController.addLogicalAddress(logicalAddress);
		allocatedDevices.add(localDevice);
		}