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

Commit 3759c162 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Fix a removal-while-iterate bug 

The onStatusChangedLocked removes entries from the ArrayMap. Needs to
iterate in the reverse order.

Test: Vendor testing
Bug: 182876702
Change-Id: I5891f24a25c83f096d23ca5675126889a7d2a61c
parent dfb0754d

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

+3 −1
Original line number Diff line number Diff line
@@ -2024,7 +2024,9 @@ public final class CameraManager { 
                // Tell listeners that the cameras and torch modes are unavailable and schedule a

                // reconnection to camera service. When camera service is reconnected, the camera

                // and torch statuses will be updated.

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

                // Iterate from the end to the beginning befcause onStatusChangedLocked removes

                // entries from the ArrayMap.

                for (int i = mDeviceStatus.size() - 1; i >= 0; i--) {

                    String cameraId = mDeviceStatus.keyAt(i);

                    onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, cameraId);

                }