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

Merge "Update local device info" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-18 09:05:54 +00:00
committed by Android (Google) Code Review
parent a067b1c0ee 9fa4dc0ff8
commit 3e7b20e500
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -682,7 +682,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly @ServiceThreadOnly
private void launchDeviceDiscovery() { private void launchDeviceDiscovery() {
assertRunOnServiceThread(); assertRunOnServiceThread();
clearDeviceInfoList();
DeviceDiscoveryAction action = new DeviceDiscoveryAction(this, DeviceDiscoveryAction action = new DeviceDiscoveryAction(this,
new DeviceDiscoveryCallback() { new DeviceDiscoveryCallback() {
@Override @Override
@@ -691,13 +690,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
mService.getHdmiCecNetwork().addCecDevice(info); 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(); mSelectRequestBuffer.process();
resetSelectRequestBuffer(); resetSelectRequestBuffer();

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

@@ -1267,6 +1267,7 @@ public class HdmiControlService extends SystemService {
// It's now safe to flush existing local devices from mCecController since they were // It's now safe to flush existing local devices from mCecController since they were
// already moved to 'localDevices'. // already moved to 'localDevices'.
clearCecLocalDevices(); clearCecLocalDevices();
mHdmiCecNetwork.clearDeviceList();
allocateLogicalAddress(localDevices, initiatedBy); allocateLogicalAddress(localDevices, initiatedBy);
} }
@@ -1303,6 +1304,7 @@ public class HdmiControlService extends SystemService {
HdmiControlManager.POWER_STATUS_ON, getCecVersion()); HdmiControlManager.POWER_STATUS_ON, getCecVersion());
localDevice.setDeviceInfo(deviceInfo); localDevice.setDeviceInfo(deviceInfo);
mHdmiCecNetwork.addLocalDevice(deviceType, localDevice); mHdmiCecNetwork.addLocalDevice(deviceType, localDevice);
mHdmiCecNetwork.addCecDevice(localDevice.getDeviceInfo());
mCecController.addLogicalAddress(logicalAddress); mCecController.addLogicalAddress(logicalAddress);
allocatedDevices.add(localDevice); allocatedDevices.add(localDevice);
} }