Merge "Camera: remove NOT_PRESENT cameras"

am: 174df238ac Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
2018-01-23 02:12:57 +00:00
parent cdeb50aa48 174df238ac
commit 0e32a62cd4
1 changed files with 6 additions and 1 deletions
--- 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) {