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

Commit bb746823 authored by Angus Kong's avatar Angus Kong Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce

parents 8227ac66 229ae138

src/com/android/camera/CameraManager.java

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ public class CameraManager { 
                holder = mReconnectExceptionQueue.take();

            } catch (InterruptedException ex) {

            }

            if (holder == null || holder.ex != null) {

            if (holder != null && holder.ex != null) {

                throw holder.ex;

            }

        }