diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-12 22:21:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-12 22:21:54 +0000 |
| commit | e36829ee00d178846cb95bebde41cc9204edcd76 (patch) | |
| tree | a0cd5cab11f1ed09c75931a8f4fc72c33b010acd | |
| parent | 7d4412255b3dc5625444f33f04abf57683351aad (diff) | |
| parent | b44864e76b56006298e574f8ce5539a1c9e1750f (diff) | |
| download | frameworks_base-e36829ee00d178846cb95bebde41cc9204edcd76.zip frameworks_base-e36829ee00d178846cb95bebde41cc9204edcd76.tar.gz frameworks_base-e36829ee00d178846cb95bebde41cc9204edcd76.tar.bz2 | |
Merge "Fix legacy disconnect callback." into mnc-dev
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/RequestThreadManager.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java index 348b14a..4866598 100644 --- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java +++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java @@ -187,8 +187,18 @@ public class RequestThreadManager { private final Camera.ErrorCallback mErrorCallback = new Camera.ErrorCallback() { @Override public void onError(int i, Camera camera) { - Log.e(TAG, "Received error " + i + " from the Camera1 ErrorCallback"); - mDeviceState.setError(CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE); + switch(i) { + case Camera.CAMERA_ERROR_EVICTED: { + flush(); + mDeviceState.setError( + CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DISCONNECTED); + } break; + default: { + Log.e(TAG, "Received error " + i + " from the Camera1 ErrorCallback"); + mDeviceState.setError( + CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE); + } break; + } } }; |