diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2018-01-23 02:12:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-23 02:12:57 +0000 |
| commit | 0e32a62cd453f26903ea47bcc9e003053128b454 (patch) | |
| tree | d003c538ca448a4c4ad4b9007f5964ed4dd63d08 /core/java/android | |
| parent | cdeb50aa484f0f12d0ec081916062b4240ce5dbe (diff) | |
| parent | 174df238ac2ce4e952c88d0aa83505aa123629e5 (diff) | |
Merge "Camera: remove NOT_PRESENT cameras"
am: 174df238ac
Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
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) { |