diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
index f1626d6..21014d0 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
@@ -233,7 +233,9 @@
             }
 
             synchronized (mLock) {
-                assertInitialState();
+                // Don't assert all initial states. onDisconnected can be called after camera
+                // is successfully opened.
+                assertEquals(false, mDisconnected);
                 mNoReply = false;
                 mDisconnected = true;
                 mDevice = camera;