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

Commit ec126a57 authored by Amy's avatar Amy Committed by shubang
Browse files

Add a thread safe copy of connected device list. 

ag/5398140

We are adding a thread safe list of the devices connected to the
current device. Also adding some methods to update/get the list.

HdmiControlService can call to get the list and the information.

Test: local tested.
Change-Id: I25715065c744a976bcf0d038cbe8568d8c44d0f9
parent 0bf94c6d

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

+26 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly; 
import java.io.UnsupportedEncodingException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashMap;

import java.util.List;

import java.util.stream.Collectors;
@@ -84,6 +85,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    // processing.

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



    // Copy of mDeviceInfos to guarantee thread-safety.

    @GuardedBy("mLock")

    private List<HdmiDeviceInfo> mSafeAllDeviceInfos = Collections.emptyList();



    // Map-like container of all cec devices.

    // device id is used as key of container.

    private final SparseArray<HdmiDeviceInfo> mDeviceInfos = new SparseArray<>();
@@ -174,6 +179,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
            removeDeviceInfo(deviceInfo.getId());

        }

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

        updateSafeDeviceInfoList();

        return oldDeviceInfo;

    }
@@ -191,6 +197,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        if (deviceInfo != null) {

            mDeviceInfos.remove(id);

        }

        updateSafeDeviceInfoList();

        return deviceInfo;

    }
@@ -207,6 +214,24 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        return mDeviceInfos.get(HdmiDeviceInfo.idForCecDevice(logicalAddress));

    }



    @ServiceThreadOnly

    private void updateSafeDeviceInfoList() {

        assertRunOnServiceThread();

        List<HdmiDeviceInfo> copiedDevices = HdmiUtils.sparseArrayToList(mDeviceInfos);

        synchronized (mLock) {

            mSafeAllDeviceInfos = copiedDevices;

        }

    }



    @GuardedBy("mLock")

    List<HdmiDeviceInfo> getSafeCecDevicesLocked() {

        ArrayList<HdmiDeviceInfo> infoList = new ArrayList<>();

        for (HdmiDeviceInfo info : mSafeAllDeviceInfos) {

            infoList.add(info);

        }

        return infoList;

    }



    private void invokeDeviceEventListener(HdmiDeviceInfo info, int status) {

        mService.invokeDeviceEventListeners(info, status);

    }
@@ -1086,6 +1111,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE);

        }

        mDeviceInfos.clear();

        updateSafeDeviceInfoList();

    }



    @Override