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

Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." am: b2f70b04d4

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

Change-Id: Ia40a8b7d8da08eb964a2ada93478b4a80249f3ac
This commit is contained in:
Jayant Chowdhary
2021-04-06 22:24:10 +00:00
committed by Automerger Merge Worker
parent 1feef50cc1 b2f70b04d4
commit 3c83e580b0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1363,6 +1363,8 @@ public final class CameraManager {
// devices going offline (in real world scenarios, these permissions aren't // devices going offline (in real world scenarios, these permissions aren't
// changeable). Future calls to getCameraIdList() will reflect the changes in // changeable). Future calls to getCameraIdList() will reflect the changes in
// the camera id list after getCameraIdListNoLazy() is called. // the camera id list after getCameraIdListNoLazy() is called.
// We need to remove the torch ids which may have been associated with the
// devices removed as well. This is the same situation.
cameraStatuses = mCameraService.addListener(testListener); cameraStatuses = mCameraService.addListener(testListener);
mCameraService.removeListener(testListener); mCameraService.removeListener(testListener);
for (CameraStatus c : cameraStatuses) { for (CameraStatus c : cameraStatuses) {
@@ -1381,6 +1383,7 @@ public final class CameraManager {
} }
for (String id : deviceIdsToRemove) { for (String id : deviceIdsToRemove) {
onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, id); onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, id);
mTorchStatus.remove(id);
} }
} catch (ServiceSpecificException e) { } catch (ServiceSpecificException e) {
// Unexpected failure // Unexpected failure