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

Commit f644d43f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Address device state listener delay" into udc-qpr-dev am: 41fc44e3 am: 64fb054b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23783660



Change-Id: I2ed5f4918f9ed274ccf5bf6b9e9b394ceefe93ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 440760f4 64fb054b

core/java/android/hardware/camera2/CameraManager.java

+6 −7
Original line number Diff line number Diff line
@@ -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<WeakReference<DeviceStateListener>> invalidListeners = new ArrayList<>();

            for (WeakReference<DeviceStateListener> listener : mDeviceStateListeners) {

                DeviceStateListener callback = listener.get();

            Iterator<WeakReference<DeviceStateListener>> 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));

        }