diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-23 00:52:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-23 00:52:00 +0000 |
| commit | 174df238ac2ce4e952c88d0aa83505aa123629e5 (patch) | |
| tree | 5b12bfd955fdc3160147e0e62f85c38f3ba0f3e5 /core/java/android | |
| parent | 1683b6968d40f4fdccdd62b5b98c103024db1f5e (diff) | |
| parent | 0c961165c25082936a8852f5ec97a1a820936fc2 (diff) | |
Merge "Camera: remove NOT_PRESENT cameras"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 90bf896c2225..a2bc91e0cda6 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -996,7 +996,12 @@ public final class CameraManager { return; } - Integer oldStatus = mDeviceStatus.put(id, status); + Integer oldStatus; + if (status == ICameraServiceListener.STATUS_NOT_PRESENT) { + oldStatus = mDeviceStatus.remove(id); + } else { + oldStatus = mDeviceStatus.put(id, status); + } if (oldStatus != null && oldStatus == status) { if (DEBUG) { |