Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac

am: 0e32a62cd4 Change-Id: I5b2d1d756daf1fabd8d42b9161de6a63d8989302
2018-01-23 02:35:28 +00:00
parent cbbed8ee1f 0e32a62cd4
commit 75774be569
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) {