diff options
| author | Sheng-Hao Tsao <shenghao@google.com> | 2017-03-02 12:31:40 +0800 |
|---|---|---|
| committer | Sheng-hao Tsao <shenghao@google.com> | 2017-03-02 07:23:28 +0000 |
| commit | bf39f791ab7c79457de2c2f21ac2260a6754c029 (patch) | |
| tree | a3f0b34d21be2ed9d8c409bb91a455fd9c152038 | |
| parent | 7921659d7096a618634153ca7fed88e8563e03f5 (diff) | |
| download | ex-oreo-r2-release.tar.gz | |
Fix the bug that camera can't open again after disconnectedandroid-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r4android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1oreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
Reproduce steps:
1. Open android default camera
2. Open chrome camera app
3. Close chrome camera app
4. Android camera app is disconnected. Close it.
5. Open android camera app again. It can't open camera anymore.
The root cause is that camera state is set to invalid after getting
an exception in step 4. We should not invalidate the camera.
BUG=35411023
TEST=In samus, verify that camera can be opened after the above steps
Change-Id: I63bcc3587d1c7970c1bad8bffa628fa579f831ef
(cherry picked from commit a822d5c3528473582de6b2f9db0bee3ea2a18190)
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java index 1064d29f..a2b6299b 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java @@ -620,9 +620,6 @@ class AndroidCameraAgentImpl extends CameraAgent { "] at CameraState[" + cameraState + "]"; Log.e(TAG, "RuntimeException during " + errorContext, ex); - // Be conservative by invalidating both CameraAgent and CameraProxy objects. - mCameraState.invalidate(); - if (mCamera != null) { Log.i(TAG, "Release camera since mCamera is not null."); try { |