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

Commit 5c6026b4 authored by Amy's avatar Amy Committed by shubang
Browse files

Add array and add/remove methods to track connected device info 

ag/5258321

Add a local array mDeviceInfos to keep track of the device connected to
the current device. Also add the method to invoke deviceEventListener to
keep TIF updated on the new device info. Callback will be added in
separate CL.

We still need to decide when to add/remove the device info.
We can do add at PhysicalAddress report, OsdName report, deviceDiscovery
at bootup, power status report and Active Source.

Test: local tested
Bug: 117291910
Change-Id: I124dc27bf9da9412850e658e1e6413cf9d71e5ce
parent f9fa6175

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

+93 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    // processing.

    private final HashMap<Integer, String> mTvInputs = new HashMap<>();



    // Map-like container of all cec devices.

    // device id is used as key of container.

    private final SparseArray<HdmiDeviceInfo> mDeviceInfos = new SparseArray<>();



    protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {

        super(service, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);

        mSystemAudioControlFeatureEnabled = true;
@@ -86,6 +90,95 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
                "com.droidlogic.tvinput/.services.Hdmi3InputService/HW7");

    }



    /**

     * Called when a device is newly added or a new device is detected or

     * existing device is updated.

     *

     * @param info device info of a new device.

     */

    @ServiceThreadOnly

    final void addCecDevice(HdmiDeviceInfo info) {

        assertRunOnServiceThread();

        HdmiDeviceInfo old = addDeviceInfo(info);

        if (info.getLogicalAddress() == mAddress) {

            // The addition of the device itself should not be notified.

            return;

        }

        if (old == null) {

            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE);

        } else if (!old.equals(info)) {

            invokeDeviceEventListener(old, HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE);

            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE);

        }

    }



    /**

     * Called when a device is removed or removal of device is detected.

     *

     * @param address a logical address of a device to be removed

     */

    @ServiceThreadOnly

    final void removeCecDevice(int address) {

        assertRunOnServiceThread();

        HdmiDeviceInfo info = removeDeviceInfo(HdmiDeviceInfo.idForCecDevice(address));



        mCecMessageCache.flushMessagesFrom(address);

        invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE);

    }



    /**

     * Add a new {@link HdmiDeviceInfo}. It returns old device info which has the same

     * logical address as new device info's.

     *

     * @param deviceInfo a new {@link HdmiDeviceInfo} to be added.

     * @return {@code null} if it is new device. Otherwise, returns old {@HdmiDeviceInfo}

     *         that has the same logical address as new one has.

     */

    @ServiceThreadOnly

    private HdmiDeviceInfo addDeviceInfo(HdmiDeviceInfo deviceInfo) {

        assertRunOnServiceThread();

        HdmiDeviceInfo oldDeviceInfo = getCecDeviceInfo(deviceInfo.getLogicalAddress());

        if (oldDeviceInfo != null) {

            removeDeviceInfo(deviceInfo.getId());

        }

        mDeviceInfos.append(deviceInfo.getId(), deviceInfo);

        return oldDeviceInfo;

    }



    /**

     * Remove a device info corresponding to the given {@code logicalAddress}.

     * It returns removed {@link HdmiDeviceInfo} if exists.

     *

     * @param id id of device to be removed

     * @return removed {@link HdmiDeviceInfo} it exists. Otherwise, returns {@code null}

     */

    @ServiceThreadOnly

    private HdmiDeviceInfo removeDeviceInfo(int id) {

        assertRunOnServiceThread();

        HdmiDeviceInfo deviceInfo = mDeviceInfos.get(id);

        if (deviceInfo != null) {

            mDeviceInfos.remove(id);

        }

        return deviceInfo;

    }



    /**

     * Return a {@link HdmiDeviceInfo} corresponding to the given {@code logicalAddress}.

     *

     * @param logicalAddress logical address of the device to be retrieved

     * @return {@link HdmiDeviceInfo} matched with the given {@code logicalAddress}.

     *         Returns null if no logical address matched

     */

    @ServiceThreadOnly

    HdmiDeviceInfo getCecDeviceInfo(int logicalAddress) {

        assertRunOnServiceThread();

        return mDeviceInfos.get(HdmiDeviceInfo.idForCecDevice(logicalAddress));

    }



    private void invokeDeviceEventListener(HdmiDeviceInfo info, int status) {

        mService.invokeDeviceEventListeners(info, status);

    }



    @Override

    @ServiceThreadOnly

    protected void onStandby(boolean initiatedByCec, int standbyAction) {