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

Commit 979cf8e4 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

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

parents 40fbaa79 2a3eced1

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) {