Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix legacy disconnect callback." into mnc-dev

Browse Source
This commit is contained in:
Ruben Brunk
2015-06-12 22:21:52 +00:00
committed by Android (Google) Code Review
parent 7d4412255b b44864e76b
commit e36829ee00
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/hardware/camera2/legacy/RequestThreadManager.java
View File

@@ -187,8 +187,18 @@ public class RequestThreadManager {
private final Camera.ErrorCallback mErrorCallback = new Camera.ErrorCallback() { private final Camera.ErrorCallback mErrorCallback = new Camera.ErrorCallback() {
@Override @Override
public void onError(int i, Camera camera) { public void onError(int i, Camera camera) {
Log.e(TAG, "Received error " + i + " from the Camera1 ErrorCallback"); switch(i) {
mDeviceState.setError(CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE); 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;
}
} }
}; };