summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-06-12 14:39:12 -0700
committerRuben Brunk <rubenbrunk@google.com>2015-06-12 14:39:12 -0700
commitb44864e76b56006298e574f8ce5539a1c9e1750f (patch)
treed905cf244a281b819ebbcf53ecd22ee787a48ca1 /core/java/android
parenta94c6033452b465a28d6bd76015d4a1de6b1bd29 (diff)
downloadframeworks_base-b44864e76b56006298e574f8ce5539a1c9e1750f.zip
frameworks_base-b44864e76b56006298e574f8ce5539a1c9e1750f.tar.gz
frameworks_base-b44864e76b56006298e574f8ce5539a1c9e1750f.tar.bz2
Fix legacy disconnect callback.
Bug: 21708377 Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/camera2/legacy/RequestThreadManager.java14
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 f935b6d..d93fb74 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -188,8 +188,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;
+ }
}
};