Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0913be84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update local device info" into udc-dev am: 3e7b20e5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22564979



Change-Id: I48405010e323eadeca4150fcffe1cb06a6f6f61a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88a188eb 3e7b20e5

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();

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

+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);

                            }