commit c31392c62ae0a8eada11f340ac93752a9ca5d25d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 24 16:37:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 24 16:37:35 2018 +0000
tree 71cb0f88b020aa4e9c64e77d6d617f1789de6a7b
parent ac7fbf2412e987372cf7ca1a2369b6c76acb5a89
parent 67008fa749f0e4310f1d77ce96f452678aa4e67f

Merge "Convert frameworks/ex/camera2 to Android.bp"

camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java

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;