Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75774be5 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

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

am: 0e32a62c

Change-Id: I5b2d1d756daf1fabd8d42b9161de6a63d8989302
parents cbbed8ee 0e32a62c

core/java/android/hardware/camera2/CameraManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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) {