Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I537e8fab411b8134cf43d71790ebe62d238a71b6
This commit is contained in:
Shuzhen Wang
2021-03-19 18:58:14 +00:00
committed by Automerger Merge Worker
parent 4f17d64ff8 171249e857
commit f1f504042a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraManager.java
View File

@@ -2024,7 +2024,9 @@ public final class CameraManager {
// Tell listeners that the cameras and torch modes are unavailable and schedule a // Tell listeners that the cameras and torch modes are unavailable and schedule a
// reconnection to camera service. When camera service is reconnected, the camera // reconnection to camera service. When camera service is reconnected, the camera
// and torch statuses will be updated. // 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); String cameraId = mDeviceStatus.keyAt(i);
onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, cameraId); onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, cameraId);
} }