Fix NPE when reconnecting camera.

bug:8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3

diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java
index 65b2bb8..e89c2eb 100644 (file)
--- a/src/com/android/camera/CameraManager.java
+++ b/src/com/android/camera/CameraManager.java
@@ -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;
             }
         }