From f953dd37acb70f96583c6bbdc37db51a540003a3 Mon Sep 17 00:00:00 2001 From: Biswarup Pal Date: Tue, 4 Mar 2025 05:35:23 -0800 Subject: Remove unused CDM association listener from VDM service #codehealth Test: presubmit Bug: 263231559 Flag: EXEMPT cleanup Change-Id: I4e8aff797c6334e41eeeb0150cf3fbdab8e4ba07 --- .../virtual/VirtualDeviceManagerService.java | 35 ---------------------- 1 file changed, 35 deletions(-) diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java index 93b4de856463..caf535ce7a40 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java @@ -142,14 +142,6 @@ public class VirtualDeviceManagerService extends SystemService { @GuardedBy("mVirtualDeviceManagerLock") private ArrayMap mActiveAssociations = new ArrayMap<>(); - private final CompanionDeviceManager.OnAssociationsChangedListener mCdmAssociationListener = - new CompanionDeviceManager.OnAssociationsChangedListener() { - @Override - public void onAssociationsChanged(@NonNull List associations) { - syncVirtualDevicesToCdmAssociations(associations); - } - }; - private class StrongAuthTracker extends LockPatternUtils.StrongAuthTracker { final Set mUsersInLockdown = new ArraySet<>(); @@ -348,33 +340,6 @@ public class VirtualDeviceManagerService extends SystemService { return true; } - private void syncVirtualDevicesToCdmAssociations(List associations) { - Set virtualDevicesToRemove = new HashSet<>(); - synchronized (mVirtualDeviceManagerLock) { - if (mVirtualDevices.size() == 0) { - return; - } - - Set 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 associations) { ArrayMap vdmAssociations = new ArrayMap<>(); for (int i = 0; i < associations.size(); ++i) { -- cgit v1.2.3-59-g8ed1b