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

Commit 6cbd7a8f authored by Igor Murashkin's avatar Igor Murashkin Committed by Android Git Automerger
Browse files

am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 

* commit '979cf8e4':
  camera2: Don't NPE when closing the CameraDevice
parents f37fb4d9 979cf8e4

core/java/android/hardware/camera2/impl/CameraDevice.java

+3 −1
Original line number Diff line number Diff line
@@ -301,7 +301,9 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { 
        synchronized (mLock) {



            try {

                if (mRemoteDevice != null) {

                    mRemoteDevice.disconnect();

                }

            } catch (CameraRuntimeException e) {

                throw e.asChecked();

            } catch (RemoteException e) {