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

Commit 9ee36803 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android Git Automerger
Browse files

am 900e04c1: am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev 

* commit '900e04c1':
  camera2: Don't NPE in onStatusChanged
parents 8b79730e 900e04c1

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

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public final class CameraManager { 


    private final ICameraService mCameraService;

    private ArrayList<String> mDeviceIdList;

    private HashSet<CameraListener> mListenerSet = new HashSet<CameraListener>();

    private final HashSet<CameraListener> mListenerSet = new HashSet<CameraListener>();

    private final Context mContext;

    private final Object mLock = new Object();
@@ -332,7 +332,7 @@ public final class CameraManager { 


                Integer oldStatus = mDeviceStatus.put(id, status);



                if (oldStatus == status) {

                if (oldStatus != null && oldStatus == status) {

                    Log.v(TAG, String.format(

                            "Device status changed to 0x%x, which is what it already was",

                            status));