diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-15 23:20:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-15 23:20:05 +0000 |
commit | db8eb3013e2d4099eb15c563e127fe9b4a98af94 (patch) | |
tree | a4b5504e2877a45d3d5d010a10c168761ee9af12 | |
parent | d66a90290b2cc7a9a538c54328df8b2292a91033 (diff) | |
parent | 36c7d879ef6e5ec63e49199e94fbcb313136c119 (diff) | |
download | ex-android-vts-9.0_r12.tar.gz |
Merge "Camera2: Handle eviction case in BlockingCameraManager" into pie-cts-devandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10pie-vts-releasepie-cts-releasepie-cts-dev
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 f1626d62..21014d03 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 @@ public class BlockingCameraManager { } 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; |