From 7ebffbe2c0db80e5a4191d5236ca086bbd55cc17 Mon Sep 17 00:00:00 2001 From: Kwangkyu Park Date: Tue, 20 Jun 2023 23:08:09 +0900 Subject: Camera: Address device state listener delay For the long running process with the frequent camera characteristic acquiring, the size of mDeviceStateListeners could increase significantly. This could cause a delay when removeAll() is invoked from handleStateChange(). This change will address this by removing old listeners when we add a new one. Bug: 288070122 Test: Manual test with a foldable device with frequent camera characteristic acquiring Change-Id: I84c807f00c876734df06d244675e39e9cfc868a2 --- core/java/android/hardware/camera2/CameraManager.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 85f8ca66715b..a098362f16aa 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -67,6 +67,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; @@ -178,22 +179,20 @@ public final class CameraManager { boolean folded = ArrayUtils.contains(mFoldedDeviceStates, state); mFoldedDeviceState = folded; - ArrayList> invalidListeners = new ArrayList<>(); - for (WeakReference listener : mDeviceStateListeners) { - DeviceStateListener callback = listener.get(); + Iterator> it = mDeviceStateListeners.iterator(); + while(it.hasNext()) { + DeviceStateListener callback = it.next().get(); if (callback != null) { callback.onDeviceStateChanged(folded); } else { - invalidListeners.add(listener); + it.remove(); } } - if (!invalidListeners.isEmpty()) { - mDeviceStateListeners.removeAll(invalidListeners); - } } public synchronized void addDeviceStateListener(DeviceStateListener listener) { listener.onDeviceStateChanged(mFoldedDeviceState); + mDeviceStateListeners.removeIf(l -> l.get() == null); mDeviceStateListeners.add(new WeakReference<>(listener)); } -- cgit v1.2.3-59-g8ed1b