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

Commit f953dd37 authored by Biswarup Pal's avatar Biswarup Pal Committed by Vladimir Komsiyski
Browse files

Remove unused CDM association listener from VDM service 

#codehealth

Test: presubmit
Bug: 263231559
Flag: EXEMPT cleanup
Change-Id: I4e8aff797c6334e41eeeb0150cf3fbdab8e4ba07
parent fdffe034

services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java

+0 −35
Original line number Diff line number Diff line
@@ -142,14 +142,6 @@ public class VirtualDeviceManagerService extends SystemService { 
    @GuardedBy("mVirtualDeviceManagerLock")

    private ArrayMap<String, AssociationInfo> mActiveAssociations = new ArrayMap<>();



    private final CompanionDeviceManager.OnAssociationsChangedListener mCdmAssociationListener =

            new CompanionDeviceManager.OnAssociationsChangedListener() {

                @Override

                public void onAssociationsChanged(@NonNull List<AssociationInfo> associations) {

                    syncVirtualDevicesToCdmAssociations(associations);

                }

            };



    private class StrongAuthTracker extends LockPatternUtils.StrongAuthTracker {

        final Set<Integer> mUsersInLockdown = new ArraySet<>();
@@ -348,33 +340,6 @@ public class VirtualDeviceManagerService extends SystemService { 
        return true;

    }



    private void syncVirtualDevicesToCdmAssociations(List<AssociationInfo> associations) {

        Set<VirtualDeviceImpl> virtualDevicesToRemove = new HashSet<>();

        synchronized (mVirtualDeviceManagerLock) {

            if (mVirtualDevices.size() == 0) {

                return;

            }



            Set<Integer> activeAssociationIds = new HashSet<>(associations.size());

            for (AssociationInfo association : associations) {

                activeAssociationIds.add(association.getId());

            }



            for (int i = 0; i < mVirtualDevices.size(); i++) {

                VirtualDeviceImpl virtualDevice = mVirtualDevices.valueAt(i);

                int deviceAssociationId = virtualDevice.getAssociationId();

                if (deviceAssociationId != CDM_ASSOCIATION_ID_NONE

                        && !activeAssociationIds.contains(deviceAssociationId)) {

                    virtualDevicesToRemove.add(virtualDevice);

                }

            }

        }



        for (VirtualDeviceImpl virtualDevice : virtualDevicesToRemove) {

            virtualDevice.close();

        }

    }



    void onCdmAssociationsChanged(List<AssociationInfo> associations) {

        ArrayMap<String, AssociationInfo> vdmAssociations = new ArrayMap<>();

        for (int i = 0; i < associations.size(); ++i) {